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

Wrestling with the compiler to pass these shared_ptr's

Browse Source
This commit is contained in:
MitchellHansen
2017-02-04 22:34:09 -08:00
parent a01b089d12
commit fa047f9e3a
10 changed files with 102 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/RayCaster.h
View File

@@ -6,7 +6,6 @@
#include "Camera.h"
#include "LightController.h"
class RayCaster {
public:
@@ -25,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_lights(std::vector<LightController::PackedData> *data) = 0;
virtual void assign_lights(std::vector<char> *data) = 0;
virtual void validate() = 0;
// draw will abstract the gl sharing and software rendering
@@ -40,7 +39,8 @@ protected:
Old_Map * map = nullptr;
Camera *camera = nullptr;
std::vector<LightController::PackedData> *lights;
// std::vector<LightController::PackedData> *lights;
std::vector<char> *lights;
int light_count = 0;
sf::Uint8 *viewport_image = nullptr;
sf::Vector4f *viewport_matrix = nullptr;