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

Working more on the lights. Trying to get around the packing requirements for passing data to CL

Browse Source
This commit is contained in:
MitchellHansen
2017-02-03 17:09:44 -08:00
parent 3f0a99a435
commit effed8a2bf
11 changed files with 198 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/RayCaster.h
View File

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