charles

eryn/charles

Fork 0

Commit graph

7d4acc28e4 Add a scene file with some vector expressions develop Eryn Wells 2014-08-22 07:34:42 -07:00
291d4a6831 [yamldumper] Print the scalar value Eryn Wells 2014-08-21 09:02:11 -07:00
5bcefd128c Print time it took to parse scene file Eryn Wells 2014-08-20 10:36:49 -07:00
36a7954df4 Add yamldumper utility Eryn Wells 2014-08-20 10:36:34 -07:00
1e73d839f3 Get rid of some dead code in reader_yaml.cc Eryn Wells 2014-08-20 10:08:08 -07:00
0ab3e17467 Objects need to be translated by their negation Eryn Wells 2014-08-20 10:06:22 -07:00
301f5ff9aa Use ToObjectSpace and FromObjectSpace for ray components Eryn Wells 2014-08-20 10:05:17 -07:00
07e75c663d Convert normal from object to world space Eryn Wells 2014-08-20 10:04:38 -07:00
cb0933ab51 threeSpheres.yml should be 800x600 Eryn Wells 2014-08-18 09:04:40 -07:00
6706623d6f Manually initialize Vector4 instead of using bzero Eryn Wells 2014-08-18 09:04:26 -07:00
df5e4fe049 Initialize Camera::mOrigin Eryn Wells 2014-08-18 09:04:11 -07:00
7c12a8bc2b Return a Color by value from Light::Contribution() Eryn Wells 2014-08-18 09:02:13 -07:00
917b74003a Declare overrides for Box methods Eryn Wells 2014-08-16 20:45:06 -07:00
db2804ac17 Merge branch 'feature/transform-matrix' into develop Eryn Wells 2014-08-16 20:36:35 -07:00
0a43eb81aa Explicitly declare overrides in Sphere Eryn Wells 2014-08-16 20:36:02 -07:00
791fdaa14a Use the Vector4 version of Matrix4::Translation for object origins Eryn Wells 2014-08-16 20:35:49 -07:00
d518d282d4 Notes in Matrix4 about using std::copy Eryn Wells 2014-08-16 20:35:01 -07:00
10195c607c operator<< for pretty-printing an entire Matrix4 Eryn Wells 2014-08-16 16:57:58 -07:00
09c5e29f63 Add a vector translation multiplication test Eryn Wells 2014-08-16 16:57:08 -07:00
22297da809 Add includes to testObject.cc Eryn Wells 2014-08-16 16:56:53 -07:00
8460f2205e Remake test_object -> testObject.cc Eryn Wells 2014-08-16 08:54:33 -07:00
3a846ec282 Add -n option for "should render" Eryn Wells 2014-08-16 08:52:40 -07:00
7e3cc3c3ed Copy properties of log tracer Eryn Wells 2014-08-16 08:33:12 -07:00
dc6efc5e65 Fix up Transposed -> Tranpose in unit tests Eryn Wells 2014-08-16 00:44:07 -07:00
c45d698424 Get a column vector of a matrix Eryn Wells 2014-08-16 00:43:43 -07:00
1daf1619ef A few more objects for the oneBox scene -- it's not really one box anymore Eryn Wells 2014-08-06 20:46:35 -07:00
050d87bd6f Place an object by its origin (only applies to spheres) Eryn Wells 2014-08-15 22:33:34 -07:00
bbbac6ff92 Fix up Object object space conversions Eryn Wells 2014-08-15 22:33:22 -07:00
8af03c3f3d Implement Object::Place Eryn Wells 2014-08-15 22:32:44 -07:00
09ea4c2bc3 Mostly default Doxyfile Eryn Wells 2014-08-13 09:04:11 -07:00
97b37d3c53 Just little tweaks Eryn Wells 2014-08-11 07:58:47 -07:00
56fff1178e ToObjectSpace copies the Ray anyway, so pass by value Eryn Wells 2014-08-10 16:58:05 -07:00
4d4dc91ff4 Add Matrix4 Inverse and Transpose Eryn Wells 2014-08-10 16:57:34 -07:00
5b25b402c7 Merge branch 'matrix4' into feature/transform-matrix Eryn Wells 2014-08-10 11:39:56 -07:00
dd36ab6fe1 Fill in missing Matrix4 symbols Eryn Wells 2014-08-10 11:39:25 -07:00
51fbba95e7 Rename some matrix tests Eryn Wells 2014-08-10 11:39:05 -07:00
620d5a5bc6 Fill in missing Vector4 symbols Eryn Wells 2014-08-10 11:38:55 -07:00
49d097a803 Get rid of Matrix<N,M>, just use Matrix4 Eryn Wells 2014-08-10 10:51:12 -07:00
30d0570010 Add TooFar to util.hh Eryn Wells 2014-08-10 10:49:45 -07:00
990d2b4c11 Add basics/util.hh Eryn Wells 2014-08-10 10:48:54 -07:00
74bbc87610 Trying to get this copy/move thing right between matrices and vectors Eryn Wells 2014-08-10 09:42:02 -07:00
96f782c4ac Add tests for matrix multiplication Eryn Wells 2014-08-10 09:41:48 -07:00
a5f451a120 Basics unit tests found some bugs! Eryn Wells 2014-08-09 22:00:54 -07:00
1f01de6393 Remove VectorParser and ColorParser destructors Eryn Wells 2014-08-09 22:00:43 -07:00
505a77d0e2 LOG_TRACE YAML events Eryn Wells 2014-08-09 22:00:23 -07:00
c90c545f40 Define color constants Eryn Wells 2014-08-09 21:30:28 -07:00
bf91fff5a2 More compiler fixups Eryn Wells 2014-08-09 21:23:11 -07:00
43c8bd95c6 Remove basics.cc from the build Eryn Wells 2014-08-09 21:22:40 -07:00
a97e7a6d2e Lights get virtual destructor and correct types Eryn Wells 2014-08-09 21:22:12 -07:00
bb789476b6 New basics gets the remainder of the stuff from old basics Eryn Wells 2014-08-09 21:21:57 -07:00
6c23fa9f32 Get rid of the old basics! Eryn Wells 2014-08-09 21:21:27 -07:00
ef9b9d04c8 Put all the parsers in the charles namespace Eryn Wells 2014-08-09 20:53:04 -07:00
b7a9f07d5e Lots of little niggling compiler errors Eryn Wells 2014-08-09 20:46:26 -07:00
3a8c955796 Put the readers and writers in charles namespace Eryn Wells 2014-08-09 20:46:14 -07:00
84cb27fa6f Allow passing intensity in PointLight constructor Eryn Wells 2014-08-09 20:45:45 -07:00
c3da70cdd9 Clean up some dependencies between scene, material, and color Eryn Wells 2014-08-09 20:34:23 -07:00
48e35dfc81 Update material.{cc,hh} Eryn Wells 2014-08-09 20:31:18 -07:00
42bef33775 Get rid of Color implementation in old basics.cc Eryn Wells 2014-08-09 20:24:45 -07:00
b001ad2cf2 light.hh include in scene.hh Eryn Wells 2014-08-09 20:24:18 -07:00
f6680f993f Clean up includes and old code in charles.cc Eryn Wells 2014-08-09 20:24:11 -07:00
161a635ab5 reader.hh Eryn Wells 2014-08-09 20:24:00 -07:00
080ee0d580 Remove Color and Vector3 from old basics Eryn Wells 2014-08-09 20:23:23 -07:00
3c3e707922 Light has a shared_ptr type, and an overridable Contribution() Eryn Wells 2014-08-09 20:23:08 -07:00
acdfb0fb60 Add PointLight in lightPoint.cc Eryn Wells 2014-08-09 20:22:35 -07:00
e1ded8a9ad Clean up for Lights (and AmbientLights) Eryn Wells 2014-08-09 20:04:42 -07:00
d085a192e8 Clean up basics::Color Eryn Wells 2014-08-09 19:39:41 -07:00
4b396cabe8 Move Color over to basics Eryn Wells 2014-08-09 19:30:47 -07:00
47ae52ed05 Woo Scene updates... Eryn Wells 2014-08-09 12:25:59 -07:00
c49457a817 Implement Normalized, LinearCombination, and operator<< on Vector4s Eryn Wells 2014-08-09 11:55:10 -07:00
9645a09a6c So much clean up for cameras Eryn Wells 2014-08-09 11:26:17 -07:00
d10d219eb3 Comment out old Ray Eryn Wells 2014-08-09 11:04:26 -07:00
19dfb66301 Cleanup for Spheres Eryn Wells 2014-08-09 11:04:17 -07:00
590f10a756 Updates for Plane Eryn Wells 2014-08-09 10:58:30 -07:00
392871a1ee Updates for Box Eryn Wells 2014-08-09 10:54:00 -07:00
70576c382a Do all the clean up needed for Object Eryn Wells 2014-08-09 10:42:49 -07:00
2c2bf09140 Compiler errors in Box::DoIntersect, hidden until now... Eryn Wells 2014-08-09 10:11:44 -07:00
217c4709aa Vector4's constructor takes default arguments Eryn Wells 2014-08-09 10:08:44 -07:00
baf40143b2 DoIntersect is an abstract method Eryn Wells 2014-08-09 10:08:29 -07:00
3846a1aa3a Move Box intersection code to DoIntersect Eryn Wells 2014-08-09 10:08:21 -07:00
d0d667d6d2 Object::Intersect Eryn Wells 2014-08-09 09:59:00 -07:00
519eb347d1 Vector4 constructor from Matrix<4,1> Eryn Wells 2014-08-09 09:57:35 -07:00
43cb182aa7 Have to use operator() for Matrix<>::operator* Eryn Wells 2014-08-09 09:57:09 -07:00
9aa557293a A Ray class in basics! Eryn Wells 2014-08-09 09:33:22 -07:00
b41cdb7186 Vector4 +, -, negation, and * Eryn Wells 2014-08-09 09:32:48 -07:00
a3d51f7cf3 TranslationMatrix() is not static Eryn Wells 2014-08-09 09:02:04 -07:00
9b6b6a20b7 Const versions of Vector4's X(), Y(), and Z() Eryn Wells 2014-08-09 09:01:52 -07:00
584d0326a9 Get rid of object's origin Eryn Wells 2014-08-09 08:59:11 -07:00
ab9ac5e963 Clean up constructors for Object and Sphere Eryn Wells 2014-08-09 08:57:41 -07:00
8ccfbc0498 Scalar multiplication Doxygen group Eryn Wells 2014-08-09 08:31:37 -07:00
cf57dfc51a I give up on Normalization Eryn Wells 2014-08-09 08:31:25 -07:00
32292a45fa Move EPSILON and MAX_DISTANCE back to basics.h Eryn Wells 2014-08-09 08:30:29 -07:00
fa3708edfb Implement a bunch of the useful Vector operations Eryn Wells 2014-08-08 23:05:38 -07:00
9b076f1533 Implement more robust * and / for Matrix Eryn Wells 2014-08-08 23:05:24 -07:00
be15d553f1 Move EPSILON and MAX_DISTANCE to basics/basics.hh Eryn Wells 2014-08-08 23:04:52 -07:00
abd38169b1 Comment out all the old Matrix4 stuff Eryn Wells 2014-08-08 22:14:36 -07:00
b59b6d85c0 Add Matrix4, implement TranslationMatrix() Eryn Wells 2014-08-08 22:14:20 -07:00
9474153736 Move Zero() and Identity() definitions to the right place Eryn Wells 2014-08-08 22:13:51 -07:00
2cadffd7d4 Fix Vector4 constructors and clean up compiler errors Eryn Wells 2014-08-08 21:47:44 -07:00
3bf72bd78d Build basics! Eryn Wells 2014-08-08 21:12:44 -07:00
da127ccde3 Vector4 subclass instead of typedef Eryn Wells 2014-08-08 21:12:37 -07:00