Browse Source

fix build

distfuncs
alistair 4 years ago
parent
commit
94e3396c5b
  1. 5
      camera.c
  2. 3
      colours.c
  3. 25
      types.h
  4. 2
      vect.h

5
camera.c

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
#include "types.h"
#include "math.h"
#include "main.h"
#define DRAW_DIST 1000.0
#define MAX_ITERATIONS 255
@ -78,4 +77,4 @@ march(struct ray *r, struct object *scene) @@ -78,4 +77,4 @@ march(struct ray *r, struct object *scene)
.travel_dist = travel_dist,
.scene_dist = scene_dist
};
}
}

3
colours.c

@ -156,6 +156,9 @@ struct colour get_rgb_from_hsl(struct colour c) { @@ -156,6 +156,9 @@ struct colour get_rgb_from_hsl(struct colour c) {
}
struct colour get_rgb(struct colour c) {
if (c.sp & CS_RGB){
return c;
}
if (c.sp & CS_HSL) {
return get_rgb_from_hsl(c);
}

25
types.h

@ -8,20 +8,22 @@ @@ -8,20 +8,22 @@
#define B_INTERNAL_HEIGHT 800
#define B_INTERNAL_WIDTH 600
#include "main.h"
enum solid_op {
ADD
};
struct ray
{
vec pos;
vec dir;
struct vec pos;
struct vec dir;
};
struct camera
{
vec pos;
vec rot;
struct vec pos;
struct vec rot;
int dims;
};
@ -34,14 +36,6 @@ struct pixel_info @@ -34,14 +36,6 @@ struct pixel_info
double scene_dist;
};
struct object
{
solid sol;
color (*col)(struct ray);
};
struct solid {
enum solid_op op;
double rotation;
@ -49,4 +43,11 @@ struct solid { @@ -49,4 +43,11 @@ struct solid {
double (*dist)(struct vec *);
};
struct object
{
struct solid sol;
color (*col)(struct ray);
};
#endif

2
vect.h

@ -32,4 +32,4 @@ struct vec* scalar_multiply_vec(struct vec* a, double multiplier); @@ -32,4 +32,4 @@ struct vec* scalar_multiply_vec(struct vec* a, double multiplier);
struct vec* perpendicular_vec(struct vec* a, struct vec* b);
#endif
#endif

Loading…
Cancel
Save