summaryrefslogtreecommitdiff
path: root/src/scene.cuh
diff options
context:
space:
mode:
Diffstat (limited to 'src/scene.cuh')
-rw-r--r--src/scene.cuh12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/scene.cuh b/src/scene.cuh
index e3d5896..a8802ad 100644
--- a/src/scene.cuh
+++ b/src/scene.cuh
@@ -2,8 +2,8 @@
#define SCENE_H
#include "common.cuh"
-#include "sphere.cuh"
#include "render_object.cuh"
+#include "sphere.cuh"
#include "include/helper_math.h"
#include <stdint.h>
@@ -14,17 +14,15 @@
class Scene {
const int max_bounces = 10;
public:
- //__device__ void render(uint8_t *image) { cam.render(); };
- __device__ Render_object **get_objs() { return objs; }
__device__ void debug();
__device__ Color raycast(struct Ray ray);
+ __device__ Render_object **get_objects() { return objs; }
private:
- //camera cam = camera();
- Sphere sp1 = Sphere(make_vect3(0, .4, -5));
- Sphere sp2 = Sphere(make_vect3(0, -0.4,-5));
+ Sphere sp1 = Sphere(make_vect3(0, -2, 5));
+ Sphere sp2 = Sphere(make_vect3(2, 0, 5));
protected:
//idk why I need to specify the size... why can't the compiler figure that out?
- Render_object *objs[3] = {&sp1, &sp2, NULL};
+ Render_object *objs[3] = {&sp1, &sp2, nullptr};
uint8_t *image;
};