mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Saving minor tweaks

Browse Source
This commit is contained in:
MitchellHansen
2016-11-02 15:58:15 -07:00
parent 518cc757a3
commit 5528e03c69
4 changed files with 72 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/Hardware_Caster.h
View File

@@ -40,20 +40,20 @@ public:
virtual ~Hardware_Caster();
int init();
int init() override;
// In interop mode, this will create a gl texture that we share
// Otherwise, it will create the pixel buffer and pass that in as an image, retreiving it each draw
// Both will create the view matrix, view res buffer
void create_viewport(int width, int height, float v_fov, float h_fov);
void create_viewport(int width, int height, float v_fov, float h_fov) override;
void assign_light(Light light);
void assign_map(Old_Map *map);
void assign_camera(Camera *camera);
void assign_light(std::string light_id, Light light) override;
void assign_map(Old_Map *map) override;
void assign_camera(Camera *camera) override;
// draw will abstract the gl sharing and software rendering
// methods of retrieving the screen buffer
void draw(sf::RenderWindow* window) = 0;
void draw(sf::RenderWindow* window) override;
private:
@@ -86,13 +86,6 @@ private:
cl_kernel getKernel(std::string kernel_name);
cl_command_queue getCommandQueue();
bool was_init_valid();
int error = 0;
bool initialized = false;
bool cl_khr_gl_sharing_fallback = false;
bool cl_supported = false;
cl_platform_id platform_id;
cl_device_id device_id;
cl_context context;

33
include/RayCaster.h
View File

@@ -13,7 +13,7 @@ public:
SHARING_NOT_SUPPORTED = 800,
OPENCL_NOT_SUPPORTED = 801,
OPENCL_ERROR = 802,
ERROR = 803
ERR = 803
};
RayCaster();
@@ -24,7 +24,7 @@ public:
virtual void assign_map(Old_Map *map) = 0;
virtual void assign_camera(Camera *camera) = 0;
virtual void create_viewport(int width, int height, float v_fov, float h_fov) = 0;
virtual void assign_light(Light light) = 0;
virtual void assign_light(std::string light_id, Light light) = 0;
// draw will abstract the gl sharing and software rendering
// methods of retrieving the screen buffer
@@ -34,31 +34,14 @@ protected:
sf::Sprite viewport_sprite;
sf::Texture viewport_texture;
// A reference to the map
Old_Map *map;
Old_Map * map;
Camera *camera;
std::map<std::string, Light> light_map;
sf::Uint8 *viewport_image;
sf::Vector4f *viewport_matrix;
// The XY resolution of the viewport
sf::Vector2<int> resolution;
// The pixel array, maybe do RBGA? Are there even 4 byte data types?
sf::Color *image;
// The direction of the camera in POLAR coordinates
sf::Vector3<float> camera_direction;
// Convert the polar coordinates to CARTESIAN
sf::Vector3<float> camera_direction_cartesian;
// The world-space position of the camera
sf::Vector3<float> camera_position;
// The distance in units the view plane is from the iris point
int view_plane_distance = 200;
// Precalculated values for the view plane rays
sf::Vector3f *view_plane_vectors;
int error = 0;
};