charles

eryn/charles

Fork 0

Commit graph

491972b6c2 Merge branch 'develop' Eryn Wells 2014-07-13 07:42:08 -07:00
a2dea2a35f Add beta environment -- debug, with optimization Eryn Wells 2014-07-13 07:42:00 -07:00
fb0f090892 Add succinct build commands, but don't use 'em yet Eryn Wells 2014-07-04 11:09:39 -07:00
fea154a058 So much clean up... Eryn Wells 2014-07-04 10:55:32 -07:00
98e1fdd4fb Add test environment Eryn Wells 2014-02-28 17:40:49 -08:00
301a7fa525 Fixing up gtest to work with scons (better!) Eryn Wells 2014-02-28 17:37:52 -08:00
47ca68760a Add test SConscript Eryn Wells 2014-02-28 09:58:34 -08:00
c9c1ba5972 Add SConscript for gtest Eryn Wells 2014-02-28 09:58:08 -08:00
7e7960ce72 Update gtest-all.cc to find src files Eryn Wells 2014-02-28 09:53:02 -08:00
083aa869d5 Move src files to root of gtest Eryn Wells 2014-02-28 09:52:50 -08:00
fe0ebd6cff Remove the cruft Eryn Wells 2014-02-28 09:51:53 -08:00
0b321237b6 Add base gtest distribution 1.7.0 Eryn Wells 2014-02-28 09:51:05 -08:00
eded4652a7 Redo environments, just a bit... Eryn Wells 2014-02-28 17:39:41 -08:00
ccde6a29a1 Add color diagnostics for clang Eryn Wells 2014-02-27 22:20:29 -08:00
ff1440b6d6 Add "Shared" COMSTR variants Eryn Wells 2014-02-27 21:57:20 -08:00
1a37170b9a Clean up env creation Eryn Wells 2014-01-31 08:42:41 -08:00
b40e4b07d9 Clean build directories -- still doesn't clean build/ though Eryn Wells 2014-01-31 08:34:11 -08:00
9540bdd26e Build only the given mode Eryn Wells 2014-01-31 08:27:37 -08:00
d4cf547683 Clean up set_toolchain_binary Eryn Wells 2014-01-30 21:01:20 -08:00
4ab61d591a Fix syntax error in set_compiler Eryn Wells 2014-01-30 20:47:24 -08:00
0a5db99852 Add linker override Eryn Wells 2014-01-30 20:43:09 -08:00
08880e87ac More tweaks for setting default compilers Eryn Wells 2014-01-30 20:39:56 -08:00
c76f986a86 Add definable overrides for C/C++ compilers and the assembler; add override for CFLAGS Eryn Wells 2014-01-30 20:36:38 -08:00
60d0112326 Few more tweaks Eryn Wells 2014-01-30 15:42:25 -08:00
3f56df90a7 Ignore build/ Eryn Wells 2014-01-30 15:14:13 -08:00
2134f6a013 Basic template SConscript Eryn Wells 2014-01-30 15:13:54 -08:00
ab85d0cd32 Fixing up SConstruct Eryn Wells 2014-01-30 15:09:28 -08:00
22f75f5e86 Ignore Scons stuff Eryn Wells 2014-01-30 14:10:40 -08:00
85213b6f50 Add empty src/SConscript Eryn Wells 2014-01-30 14:08:20 -08:00
104fe40661 Add base SConstruct Eryn Wells 2014-01-30 14:08:11 -08:00
11815346af Initial commit Eryn Wells 2014-01-30 13:39:51 -08:00
810990cbe9 Return Vector3::Zero for normal if point is not on surface of plane master Eryn Wells 2013-09-22 17:43:11 -07:00
a13ce45d39 Shift scene objects around to try to see a plane... Eryn Wells 2013-09-22 17:42:50 -07:00
ebb9b7aab9 Shift the plane down (I think) Eryn Wells 2013-09-22 12:13:11 -07:00
34296feeb2 Add a plane to the scene Eryn Wells 2013-09-22 10:16:32 -07:00
d166752f22 Add object_plane.cc to the build Eryn Wells 2013-09-22 10:16:27 -07:00
c405302613 Add operator<< overload for Object Eryn Wells 2013-09-22 10:16:15 -07:00
c6b8b167ca Add operator<< overloads for Vector3, Ray, and Color Eryn Wells 2013-09-22 10:15:41 -07:00
2ea0589b44 Add Planes Eryn Wells 2013-09-22 09:58:40 -07:00
5d14a63c37 Add cross product operation to Vector3 Eryn Wells 2013-09-22 08:37:58 -07:00
a41817217a Blend specular color with reflected color Eryn Wells 2013-09-21 17:14:47 -07:00
d5f640871c Comment about lambert shading Eryn Wells 2013-09-21 17:06:49 -07:00
daeb052003 Don't acknowledge intersections closer than t=1e-2. Eryn Wells 2013-09-21 17:02:26 -07:00
6c1e8c7ffb Add min_weight property to Scene Eryn Wells 2013-09-21 17:01:11 -07:00
482896cfa1 First pass at doing reflections -- splotchy... Eryn Wells 2013-09-21 16:45:30 -07:00
58f3cdd304 Add default values for trace_ray depth and weight arguments Eryn Wells 2013-09-21 16:45:10 -07:00
745aa27447 Add specular parameters to Material Eryn Wells 2013-09-21 15:53:16 -07:00
90530b74ef Return Black if max depth exceeded Eryn Wells 2013-09-21 15:42:11 -07:00
4eafa294ed Add /usr/local/{lib,include} to SConstruct Eryn Wells 2013-09-21 15:34:12 -07:00
8e0a14cc2f SCons: LIBS is a list Eryn Wells 2013-09-20 09:54:08 -07:00
f6e92f2571 Fix compiler errors in camera module Eryn Wells 2013-09-20 09:21:25 -07:00
746731398a Accessors for Camera attributes Eryn Wells 2013-09-17 10:15:35 -07:00
764afab8ac Camera stuff -- empty implementations of compute_primary_ray Eryn Wells 2013-09-16 16:34:48 -07:00
fb6920e923 Add X, Y, and Z unit vectors Eryn Wells 2013-09-16 16:32:41 -07:00
99f98d2bf5 Add virtual destructor to Writer Eryn Wells 2013-09-15 09:27:05 -07:00
0bd0cc277f Ignore PNG files Eryn Wells 2013-09-14 17:41:52 -07:00
4523671920 Forward declare Scene class in Writer Eryn Wells 2013-09-14 16:16:25 -07:00
16a37f6fb3 Shadows! Eryn Wells 2013-09-13 18:56:07 -07:00
3dbde9a60d Set diffuse parameters for materials Eryn Wells 2013-09-13 18:39:31 -07:00
529b1978a6 Use diffuse parameters to compute shading Eryn Wells 2013-09-13 18:39:23 -07:00
887233e3e4 Add diffuse parameters to Material Eryn Wells 2013-09-13 18:39:11 -07:00
438b0734a4 Use ambient light in lighting calculations Eryn Wells 2013-09-13 18:25:22 -07:00
3b7f672ab3 Add get_ambient() to Scene Eryn Wells 2013-09-13 18:25:09 -07:00
fcc6f1a718 Add set_intensity; clean up PointLight constructors Eryn Wells 2013-09-13 18:24:12 -07:00
e72374b7db Add some ambient light Eryn Wells 2013-09-13 18:23:36 -07:00
dea1967344 Add operator overloads for Color taking Color references Eryn Wells 2013-09-13 18:23:25 -07:00
cae8b21068 Clean up shapes and lights lists Eryn Wells 2013-09-13 14:15:55 -07:00
fcd2781cc7 Add ambient property to Scene Eryn Wells 2013-09-13 14:15:34 -07:00
e55828890b Add virtual destructor for Shape class Eryn Wells 2013-09-13 14:14:45 -07:00
55ef253c10 New lighting object tree: AmbientLight -> PointLight Eryn Wells 2013-09-13 14:12:55 -07:00
9fef3c33d2 Add RGB constructor to color Eryn Wells 2013-09-13 14:10:52 -07:00
6fcfcd09b5 Add div and length tests for Vector3 Eryn Wells 2013-09-13 11:14:34 -07:00
25e7ed2b21 Add a bunch of tests for Vector3 Eryn Wells 2013-09-13 11:10:07 -07:00
b631875246 Add operator== and operator!= to Vector3 Eryn Wells 2013-09-13 11:09:37 -07:00
a5fd16e5b3 Build test with gtest, correctly Eryn Wells 2013-09-13 11:09:20 -07:00
e8a6099158 Move main() and test code for basics to C++ Eryn Wells 2013-09-12 16:16:29 -07:00
6be100e28a Update testing makefile Eryn Wells 2013-09-12 15:54:17 -07:00
da87ac8dd2 Add operator overloads for Colors and floats Eryn Wells 2013-09-12 15:51:08 -07:00
d9a8920cdf Add gtest Eryn Wells 2013-09-12 15:50:40 -07:00
4799a7fe49 Code formatting in basics Eryn Wells 2013-09-12 15:00:26 -07:00
67cb6c9fea Implement operator overloads for Vector3 Eryn Wells 2013-09-12 14:59:33 -07:00
cc126a153e Add ray count and duration stats Eryn Wells 2013-09-12 09:10:22 -07:00
a3bdc01d45 Compact some normalization and stuff Eryn Wells 2013-09-11 22:11:56 -07:00
0e678938fe Move the light Eryn Wells 2013-09-11 22:11:44 -07:00
fcde85c642 Return *this after normalizing Eryn Wells 2013-09-11 22:07:34 -07:00
e76bf0f444 Lambert shading! Eryn Wells 2013-09-11 22:03:50 -07:00
1e39776145 Return a normalized vector from compute_normal Eryn Wells 2013-09-11 22:03:36 -07:00
3646fa40ab Remove the second light Eryn Wells 2013-09-11 22:03:18 -07:00
8a1934f957 Reorder some code -- just some formatting Eryn Wells 2013-09-11 10:35:03 -07:00
247e205827 Return material color if there was a ray intersection Eryn Wells 2013-09-11 10:33:56 -07:00
3a5c6cddf9 Add max_depth parameter Eryn Wells 2013-09-11 10:33:16 -07:00
2c23fb819e Add Materials to the shapes in the scene Eryn Wells 2013-09-11 09:05:27 -07:00
b480e2c869 Lights need basics.h Eryn Wells 2013-09-11 08:57:05 -07:00
c6c11ca95a Add operator*= to colors Eryn Wells 2013-09-11 08:56:53 -07:00
51c79b9b76 Add Material class Eryn Wells 2013-09-11 08:56:28 -07:00
aed523d457 Add lights to the scene Eryn Wells 2013-09-11 08:38:39 -07:00
86a9c74c1e Activate point_is_on_surface() and calculate_normal() Eryn Wells 2013-09-10 22:32:33 -07:00
6bb7689ac0 Add lights to the scene Eryn Wells 2013-09-10 21:49:01 -07:00
14b246b6e9 Add light module Eryn Wells 2013-09-10 21:48:41 -07:00
72c0d1475e Yay! Eryn Wells 2013-09-10 21:04:56 -07:00