charles

eryn/charles

Fork 0

Commit graph

aa694e8128 Update object_sphere for C++; inherit from Shape Eryn Wells 2013-09-10 21:04:31 -07:00
df7a8988b2 Remove scene.c Eryn Wells 2013-09-10 21:03:29 -07:00
c9b130c121 Update main() for C++ Eryn Wells 2013-09-10 21:02:40 -07:00
b42a756042 Basic functions can't be inline (wat); fix dot product error Eryn Wells 2013-09-10 21:02:30 -07:00
5d8a940f30 Convert writer_png to C++; add Writer class; add PNGWriter class Eryn Wells 2013-09-10 21:01:29 -07:00
568e3f4c55 Update scene module for C++ Eryn Wells 2013-09-10 16:28:32 -07:00
17344bb4cd Add scene.cc to build Eryn Wells 2013-09-10 16:28:17 -07:00
1d238d6923 Fix object_sphere.cc Eryn Wells 2013-09-10 16:27:39 -07:00
6de49ae679 Add operator= to Vector3 and Color Eryn Wells 2013-09-10 16:25:12 -07:00
e5601e7f43 Define constructors for Object and Shape; move a bunch of Sphere code to object_sphere Eryn Wells 2013-09-10 15:45:13 -07:00
f062efc349 Make Vector3 methods const Eryn Wells 2013-09-10 15:34:08 -07:00
68a4855edf Add object.cc and object_sphere.cc to SConscript Eryn Wells 2013-09-10 09:34:32 -07:00
249f77e6cf Add object_sphere.h Eryn Wells 2013-09-10 09:34:15 -07:00
2d66ba0945 Move Sphere::does_intersect to object_sphere; fill out object_sphere in C++ Eryn Wells 2013-09-10 09:33:59 -07:00
a02e31952e Update object.cc for C++ Eryn Wells 2013-09-10 09:18:05 -07:00
6ad2f16acd Comments for basics! Eryn Wells 2013-09-09 23:03:41 -07:00
08b10bba19 const char * in charles.cc Eryn Wells 2013-09-09 22:51:55 -07:00
4e28c26cc9 Update SConscript with .cc files Eryn Wells 2013-09-09 22:51:10 -07:00
a4a6dc8589 Move .cpp to .cc Eryn Wells 2013-09-09 22:50:41 -07:00
3006c6a8bc Convert charles.c to C++ Eryn Wells 2013-09-09 22:48:52 -07:00
b973003a6b Convert basics to C++ Eryn Wells 2013-09-09 22:47:19 -07:00
86a5055d63 Add CXXCOMSTR; add -std= options to CFLAGS and CXXFLAGS Eryn Wells 2013-09-09 22:37:44 -07:00
ebc561e415 Modify SConstruct for C++ Eryn Wells 2013-09-09 21:45:25 -07:00
f80b580017 Play with the dot product test -- it wasn't sufficient to catch an error >_< Eryn Wells 2013-09-09 09:06:19 -07:00
07c70b2bc7 Initialize ray before testing intersection Eryn Wells 2013-09-09 09:03:07 -07:00
ee536de7dc Add tests for sphere_point_lies_on_surface and sphere_compute_normal Eryn Wells 2013-09-09 08:53:19 -07:00
600f93b908 Use test_assert_within_epsilon for testing floating point equality Eryn Wells 2013-09-09 08:53:05 -07:00
13ca9abc53 Add test_asserts module Eryn Wells 2013-09-09 08:52:35 -07:00
bfb1a1b3d5 Add sphere_point_lies_on_surface and sphere_compute_normal Eryn Wells 2013-09-09 08:52:14 -07:00
ca2a5c1b3b Use INFINITY for nearest_t Eryn Wells 2013-09-08 21:08:52 -07:00
a644539fd3 TODO: Lighting Eryn Wells 2013-09-08 20:52:57 -07:00
5a54e325f2 Image is 640x480 Eryn Wells 2013-09-08 20:46:29 -07:00
de77b9680b Three spheres Eryn Wells 2013-09-08 20:46:22 -07:00
7524c9c3d8 Fix scene_add_object -- break out of the while loop! Eryn Wells 2013-09-08 20:46:11 -07:00
1760170952 Fix funky scene_render code, for correctness Eryn Wells 2013-09-08 20:38:01 -07:00
39871d33fe Fix funky PNG writer code, for correctness Eryn Wells 2013-09-08 20:37:05 -07:00
c65f46a1fa Tweaks in basics, for correctness Eryn Wells 2013-09-08 20:32:38 -07:00
11dc22fb8c Remove optimization for b =~ sqrt(b^2 - 4ac) Eryn Wells 2013-09-08 18:46:51 -07:00
6e3f92e47c Comment and formatting tweaks Eryn Wells 2013-09-08 18:28:53 -07:00
45b71f18db Move checking intersection of ray and sphere in unit tests to check_sphere_intersection Eryn Wells 2013-09-08 18:07:30 -07:00
5129a6e545 Update object module with changes to basics Eryn Wells 2013-09-08 18:06:40 -07:00
4e6e0610ba Add test_vector_negate Eryn Wells 2013-09-08 18:00:41 -07:00
d2afb4e10a Add tests for add_vector, mul_scalar, and sub_vector Eryn Wells 2013-09-08 17:58:32 -07:00
21ccba45e4 Clean up basics a bit; add vector_negate, ray_parameterize Eryn Wells 2013-09-08 17:45:37 -07:00
0fa10c3220 Sphere intersection test Eryn Wells 2013-09-08 15:35:58 -07:00
d636a4f2ee Add comment about efficiency in vector_normalize Eryn Wells 2013-09-08 15:18:48 -07:00
5a0d215789 Add test modules Eryn Wells 2013-09-08 15:18:15 -07:00
ebcb67a0cc Fixing the build system again Eryn Wells 2013-09-08 14:53:11 -07:00
f81e403b16 Revamp build system: build src and test into libs and link to make binaries Eryn Wells 2013-09-08 13:57:05 -07:00
926247002b Add test directory to SCons Eryn Wells 2013-09-08 12:21:24 -07:00
b1d61b5ddc Add SConscript for test Eryn Wells 2013-09-08 12:14:36 -07:00
884c16424d Change the location and size of sphere to compensate for simplified ray generation Eryn Wells 2013-09-08 12:09:19 -07:00
2417176f0c Change how rays are generated -- parallel to Z axis Eryn Wells 2013-09-08 12:09:02 -07:00
4407f757e6 Initialize nearest_t to 1e8 Eryn Wells 2013-09-08 11:56:57 -07:00
d9d27e2d22 CXXFLAGS != CFLAGS Eryn Wells 2013-09-08 11:52:53 -07:00
062074f034 Add function header comment to vector_dot() Eryn Wells 2013-09-08 11:38:13 -07:00
8a8d63055f Ignore build/ Eryn Wells 2013-09-08 11:37:58 -07:00
3ea6073655 Create a build dir for object files Eryn Wells 2013-09-08 09:12:15 -07:00
8b828e45a8 Free intersection t values array after use. Eryn Wells 2013-09-08 09:06:51 -07:00
99055ff5f4 Add an object and a texture to the scene Eryn Wells 2013-09-08 08:45:32 -07:00
34428a764d If ray intersects shape, return the shape's color Eryn Wells 2013-09-08 08:45:13 -07:00
ca13877c19 Add texture to objects Eryn Wells 2013-09-07 22:22:27 -07:00
7b30584ba5 Define ColorBlack Eryn Wells 2013-09-07 22:12:35 -07:00
e77e9488c0 Add Texture module Eryn Wells 2013-09-07 22:12:27 -07:00
830979fc75 First object in Scene objects list is pointed to by scene->objects Eryn Wells 2013-09-07 21:39:02 -07:00
4e3092eecc Static-ify scene_trace_ray() Eryn Wells 2013-09-07 21:35:19 -07:00
8df7a5a6a1 Add a comment Eryn Wells 2013-09-07 18:42:36 -07:00
c45331d79d Initial interesection test for ray tracing Eryn Wells 2013-09-07 18:41:46 -07:00
c06fb87990 Add scene_add_object Eryn Wells 2013-09-07 18:41:33 -07:00
a73cce8dbf Compact declaration of default color in ray trace function Eryn Wells 2013-09-07 18:26:59 -07:00
974ebd6ccd Add sphere intersection function Eryn Wells 2013-09-07 18:26:32 -07:00
0c050734c7 Add vector_sub_vector and vector_dot to basics Eryn Wells 2013-09-07 18:26:05 -07:00
cee4113f6a Remove basics include from scene.h Eryn Wells 2013-09-07 16:48:57 -07:00
da3aa51f1b Code for objects and spheres Eryn Wells 2013-09-07 16:48:50 -07:00
b4cc32a196 Add ObjectList struct Eryn Wells 2013-09-07 16:10:50 -07:00
dc558c016b Basic driver for the ray tracer Eryn Wells 2013-09-07 16:10:42 -07:00
9d6c293cad Set is_rendered flag after scene rendering completes. Eryn Wells 2013-09-07 16:10:29 -07:00
9ad6bb7656 Fix PNG writing... yay! Eryn Wells 2013-09-07 16:09:50 -07:00
8d51a521bb Add object module Eryn Wells 2013-09-07 16:09:19 -07:00
9c01ba8811 Write the scene in writer_png Eryn Wells 2013-09-06 23:04:30 -07:00
4e27e4e960 Color is three unit8_t's instead of three floats Eryn Wells 2013-09-06 23:03:08 -07:00
1f2e7c97d6 Add writer_png module Eryn Wells 2013-09-06 22:00:04 -07:00
b72a9c8718 Link against libpng Eryn Wells 2013-09-06 21:59:49 -07:00
079ae98c9e Add a Ray object; initial bits of the tracer Eryn Wells 2013-09-06 21:15:56 -07:00
9508b01e10 Scenes have a Camera object Eryn Wells 2013-09-06 19:01:15 -07:00
6d253aab10 Add a Rect object Eryn Wells 2013-09-06 19:01:02 -07:00
87b3ca0efc Add camera module Eryn Wells 2013-09-06 19:00:28 -07:00
9cc9626146 Use vector_init in vector_normalize Eryn Wells 2013-09-06 15:34:22 -07:00
33c5e25f32 Add vector_{length2,length,normalize}() Eryn Wells 2013-09-06 15:31:38 -07:00
0377a651f5 Fiddle with the scene functions; add scene_load Eryn Wells 2013-09-06 14:52:03 -07:00
d7e33812f5 Ignore charles binary Eryn Wells 2013-09-05 22:58:12 -07:00
3ee28f9696 Include basics.h in scene.h Eryn Wells 2013-09-05 22:57:03 -07:00
1ac6e6341c Add zero vector definition Eryn Wells 2013-09-05 22:56:55 -07:00
39205a3501 Add header to SConscript Eryn Wells 2013-09-05 22:56:37 -07:00
296605f364 Add basics module Eryn Wells 2013-09-05 22:54:45 -07:00
31fefc9235 Add scene.c to SConscript Eryn Wells 2013-09-05 22:11:09 -07:00
f8806f9fd4 Add scene_render() function Eryn Wells 2013-09-05 22:08:55 -07:00
6b2d3bade9 Basic .gitignore Eryn Wells 2013-09-05 22:00:15 -07:00
495d3802e2 Some code Eryn Wells 2013-09-05 21:58:58 -07:00