charles

eryn/charles

Fork 0

Commit graph

63bb28a94a Push tNear and tFar onto t&, rather than t0 and t1 Eryn Wells 2014-07-23 07:39:55 -07:00
2b9d3a3824 Add a new scene with a single unit-box at the origin Eryn Wells 2014-07-22 21:40:39 -07:00
f5f47f5a9a Print number of objects in the scene before rendering Eryn Wells 2014-07-22 21:40:25 -07:00
deff3079b8 Update ObjectParser for boxes Eryn Wells 2014-07-22 21:40:13 -07:00
b878db592c Getters and setters for Near and Far vectors Eryn Wells 2014-07-22 21:37:49 -07:00
15db0c42d4 Box objects, parallel to the coordinate axes Eryn Wells 2014-07-22 20:46:47 -07:00
d69d708b31 Convert Vector3 to use Doubles Eryn Wells 2014-07-22 20:46:10 -07:00
1d22e27d81 Specify object types in threeSpheres.yml Eryn Wells 2014-07-20 16:55:52 -07:00
6f844f7c2a Update ObjectParser for new code style... Eryn Wells 2014-07-20 16:55:26 -07:00
5a8d634590 Update Scene a bit for new code style and namespaces in Object and Sphere Eryn Wells 2014-07-20 16:54:10 -07:00
cf7806484f Some generic, useful types Eryn Wells 2014-07-20 16:53:39 -07:00
e5cb9be1aa Don't include or build object_plane.{cc,h} because it hasn't been updated and it doesn't work. Eryn Wells 2014-07-20 16:53:03 -07:00
c185a24f34 Define shared_ptr<Sphere> as Sphere::Ptr Eryn Wells 2014-07-20 16:51:58 -07:00
12f180a3de Light implements its own origin Eryn Wells 2014-07-20 16:51:20 -07:00
19aeb7b14e Update Sphere to inherit from Object Eryn Wells 2014-07-20 16:49:15 -07:00
2036521f42 Update code style for Object Eryn Wells 2014-07-20 16:46:49 -07:00
ac8421b5e1 Update code style for Material objects Eryn Wells 2014-07-20 16:45:40 -07:00
0d2011931c Account all types of rays -- print them at the end Eryn Wells 2014-07-20 14:21:12 -07:00
c65c6a3cfd Use shared_ptr for Scene::mCamera Eryn Wells 2014-07-20 12:37:31 -07:00
c564791d1a Camera doesn't inherit from Object; defines its own origin. Eryn Wells 2014-07-20 12:37:04 -07:00
709453adcb Fix a comment about Camera::mUp Eryn Wells 2014-07-20 12:19:59 -07:00
06c2986280 Don't duplicate build files Eryn Wells 2014-07-20 12:17:55 -07:00
6ed121a039 Some notes Eryn Wells 2014-07-20 08:36:46 -07:00
ea43af46ba charles.hh – defines extern'd verbosity Eryn Wells 2014-07-19 21:20:50 -07:00
54ab0d6641 Fix aspect ratio of the three-spheres scene Eryn Wells 2014-07-19 21:19:32 -07:00
54796a74b7 Notify end-of-section after camera stuff Eryn Wells 2014-07-19 21:12:45 -07:00
4d5796e6e7 Parse the camera section of a scene Eryn Wells 2014-07-19 21:00:34 -07:00
eaabdfddc0 OHGOD TABS WERE HERE INSTEAD OF SPACES Eryn Wells 2014-07-19 21:00:15 -07:00
e2b5ffaf6c Fixing up CameraParser Eryn Wells 2014-07-19 20:59:48 -07:00
3ec5b20f16 Rename Scene::camera -> mCamera Eryn Wells 2014-07-19 20:57:12 -07:00
6f04526d36 Default and copy constructors for Perspective and Orthographic cameras Eryn Wells 2014-07-19 20:56:47 -07:00
672ff82e03 add cameraParser.cc to the build Eryn Wells 2014-07-19 17:25:54 -07:00
b85abacd26 Move camera_parser -> cameraParser Eryn Wells 2014-07-19 17:25:15 -07:00
b85a6aed7b Bit more clean up of cameras Eryn Wells 2014-07-19 17:24:52 -07:00
b03ad0ac2d Add CameraParser Eryn Wells 2014-07-19 17:24:28 -07:00
76a13e61de Update call sites and instantiation for Vector3 and Color parsers Eryn Wells 2014-07-19 17:19:54 -07:00
2c4f6a4d29 Some more helpful utility parsers Eryn Wells 2014-07-19 17:17:33 -07:00
daf5c7d8a6 Clean up camera module Eryn Wells 2014-07-19 16:30:26 -07:00
41327c92fd Remove a bunch of debugging printfs and add verbosity levels Eryn Wells 2014-07-19 16:04:47 -07:00
17df0d4adf Add "Three Spheres" scene Eryn Wells 2014-07-19 15:53:47 -07:00
1eff46006a Comment out adding objects from main() – they come from YAML now!! :D Eryn Wells 2014-07-19 15:46:38 -07:00
575ed822b4 Set shouldExpectKey after finishing radius; clean up asserts in ObjectParser Eryn Wells 2014-07-19 15:46:06 -07:00
0ed3b524f4 Print all events; properly handle document and mapping-start events from top-level run loop Eryn Wells 2014-07-19 15:45:04 -07:00
523eaef902 ScalarMappingParser::mShouldExpectKey should be true to start/end the top-level mapping Eryn Wells 2014-07-19 15:44:29 -07:00
49e3395a4c Add objects parsing to SceneParser Eryn Wells 2014-07-19 15:43:44 -07:00
43a1e790cb Initialize Parser::mDone Eryn Wells 2014-07-19 15:42:53 -07:00
0b9b5a784d Add radius section for ObjectParser Eryn Wells 2014-07-19 15:42:31 -07:00
5f02407b06 Initialize a new Sphere in ObjectParser and add it to the scene Eryn Wells 2014-07-19 15:41:45 -07:00
0a14661da8 Set material to NULL in Shape Eryn Wells 2014-07-19 15:41:17 -07:00
573f53b67c ObjectParser using ScalarMappingParser Eryn Wells 2014-07-19 14:45:37 -07:00
2f91e12296 Catch end-of-mapping event in ScalarMappingParser Eryn Wells 2014-07-19 14:22:30 -07:00
68d0083ba8 Object::get_material returns a pointer instead of a reference Eryn Wells 2014-07-19 14:09:47 -07:00
b62949416b Rename object_parser.{cc,hh} -> objectParser.{cc,hh} Eryn Wells 2014-07-19 13:42:36 -07:00
03c037730e Move scene_parser.{cc,hh} to sceneParser.{cc,hh} Eryn Wells 2014-07-19 11:43:09 -07:00
98fe95e1a5 Declare valueString before passing to ParseScalar Eryn Wells 2014-07-19 11:40:02 -07:00
693e4fa80d Make SceneParser a subclass of ScalarMappingParser Eryn Wells 2014-07-19 11:39:22 -07:00
325e9459fd Create scalar value string before passing to ParseScalar in ObjectParser Eryn Wells 2014-07-19 11:34:19 -07:00
625e3a6f47 Add ScalarMappingParser Eryn Wells 2014-07-19 11:28:03 -07:00
7153ec759b Sublime project and workspace settings Eryn Wells 2014-07-19 11:27:32 -07:00
09b0065611 Use a stringstream instead of sscanf for ParseScalar Eryn Wells 2014-07-19 10:59:22 -07:00
d65fc16219 Ignore unused parameters in PNG error functions Eryn Wells 2014-07-19 10:15:00 -07:00
6214413e3e NDEBUG *removes* asserts -- whoops Eryn Wells 2014-07-19 10:11:51 -07:00
5517aadb0a Remove prints from SConscript Eryn Wells 2014-07-18 21:27:17 -07:00
56b79c9cfb Parse test sconscripts before src -- i should probably push this commit up to base Eryn Wells 2014-07-17 20:18:20 -07:00
e7b9ee8257 Reformat some comments Eryn Wells 2014-07-17 20:17:17 -07:00
c429be330d Reset SceneParser::mSection after parsing dimensions vector Eryn Wells 2014-07-17 20:15:44 -07:00
87c544cec7 '%lf' for doubles, not '%ld' Eryn Wells 2014-07-17 20:15:20 -07:00
6ff108f360 Implement ObjectParser Eryn Wells 2014-07-17 20:14:52 -07:00
2a6f72f511 Use new coordinates to place spheres with the perspective camera Eryn Wells 2014-07-16 23:33:37 -07:00
25b246d3ed Use the PerspectiveCamera to generate primary rays. Eryn Wells 2014-07-16 23:32:44 -07:00
899064ce42 Add a perspective camera Eryn Wells 2014-07-16 23:31:39 -07:00
360bc52080 I don't really know if this is correct; I have not verified it Eryn Wells 2014-07-16 23:30:25 -07:00
0e1106aa41 Update the call signature of compute_primary_ray Eryn Wells 2014-07-16 23:29:54 -07:00
05327fbe7a Missed a few things when I… Eryn Wells 2014-07-16 23:28:40 -07:00
72e93eccb3 Reformat description of OrthographicCamera::compute_primary_ray Eryn Wells 2014-07-16 23:26:41 -07:00
8eb98270af Add Up and Right vectors to the camera Eryn Wells 2014-07-16 23:25:54 -07:00
8336753bcf Remove pixel dimensions from camera Eryn Wells 2014-07-16 23:24:31 -07:00
ca5cabb6ef Add LinearCombination for Vectors Eryn Wells 2014-07-16 23:23:26 -07:00
2834fa45c6 Replace dimensions code in SceneParser with a few lines of VectorParser magic Eryn Wells 2014-07-15 23:33:02 -07:00
bdd0afddf5 Define format strings for int and double ParseScalar() methods Eryn Wells 2014-07-15 23:32:20 -07:00
b8d0b274b1 Implement templated VectorParser Eryn Wells 2014-07-15 23:31:48 -07:00
d12f8c9fa6 Define ParseScalar<T> and ParseScalarTraits Eryn Wells 2014-07-15 23:28:59 -07:00
557d9a047f Define the Notify() method on UtilityParser Eryn Wells 2014-07-15 23:27:24 -07:00
d20e4154fe Big YAML parser cleanup Eryn Wells 2014-07-15 17:27:27 -07:00
687de91a81 Quick 'n dirty setters for height and width Eryn Wells 2014-07-13 20:12:10 -07:00
f59ec98035 HOLY CRAP I CAN READ DIMENSIONS FROM YAML FILES Eryn Wells 2014-07-13 20:11:50 -07:00
6a8bcc4973 Add back a bunch of the programatic scene stuff Eryn Wells 2014-07-13 20:11:37 -07:00
3687029bcd Parse YAML files in main() Eryn Wells 2014-07-13 18:06:21 -07:00
b4327303ee Add YAML reader Eryn Wells 2014-07-13 18:06:03 -07:00
357bcc19c0 Remove libyaml Makefiles Eryn Wells 2014-07-13 09:47:51 -07:00
24b07b65f0 libyaml Eryn Wells 2014-07-13 09:47:37 -07:00
eb0f93f476 Merge remote-tracking branch 'base/master' into develop Eryn Wells 2014-07-13 09:23:57 -07:00
dfd57da14f Correcting some build problems with old-style SConscripts Eryn Wells 2014-07-13 09:23:42 -07:00
a0edcab26d Comment about swapping env and build_env in do_sconscript() Eryn Wells 2014-07-13 09:22:53 -07:00
9b00e03b2d Get rid of broken check for lib dir existence Eryn Wells 2014-07-13 09:21:11 -07:00
882f5614ae Add build_env (as env) to sconscript environment Eryn Wells 2014-07-13 09:12:08 -07:00
2b87d5add6 Use -O3 for production Eryn Wells 2014-07-13 09:10:41 -07:00
61134833dc Remove gtest in top-level directory Eryn Wells 2014-07-13 08:56:12 -07:00
391251940b Merge remote-tracking branch 'base/master' into develop Eryn Wells 2014-07-13 08:24:16 -07:00
3ddfd94dfa No planes Eryn Wells 2014-07-13 07:43:18 -07:00