Commit graph

295 commits

Author SHA1 Message Date
98fe95e1a5 Declare valueString before passing to ParseScalar
This is to account for the length of the scalar string value, which is passed as
an element of event.data.scalar.
2014-07-19 11:40:02 -07:00
693e4fa80d Make SceneParser a subclass of ScalarMappingParser 2014-07-19 11:39:22 -07:00
325e9459fd Create scalar value string before passing to ParseScalar in ObjectParser 2014-07-19 11:34:19 -07:00
625e3a6f47 Add ScalarMappingParser 2014-07-19 11:28:03 -07:00
7153ec759b Sublime project and workspace settings 2014-07-19 11:27:32 -07:00
09b0065611 Use a stringstream instead of sscanf for ParseScalar 2014-07-19 10:59:22 -07:00
d65fc16219 Ignore unused parameters in PNG error functions 2014-07-19 10:15:00 -07:00
6214413e3e NDEBUG *removes* asserts -- whoops 2014-07-19 10:11:51 -07:00
5517aadb0a Remove prints from SConscript 2014-07-18 21:27:17 -07:00
56b79c9cfb Parse test sconscripts before src -- i should probably push this commit up to base 2014-07-17 20:18:20 -07:00
e7b9ee8257 Reformat some comments 2014-07-17 20:17:17 -07:00
c429be330d Reset SceneParser::mSection after parsing dimensions vector 2014-07-17 20:15:44 -07:00
87c544cec7 '%lf' for doubles, not '%ld' 2014-07-17 20:15:20 -07:00
6ff108f360 Implement ObjectParser 2014-07-17 20:14:52 -07:00
2a6f72f511 Use new coordinates to place spheres with the perspective camera
It works!
2014-07-16 23:33:37 -07:00
25b246d3ed Use the PerspectiveCamera to generate primary rays. 2014-07-16 23:32:44 -07:00
899064ce42 Add a perspective camera
Finally! :D Verified (mostly) and carefully thought through by looking at the
Pov-Ray code and doing the linear algebra by hand. Fun times.
2014-07-16 23:31:39 -07:00
360bc52080 I don't really know if this is correct; I have not verified it 2014-07-16 23:30:25 -07:00
0e1106aa41 Update the call signature of compute_primary_ray
It takes the current X and Y coordinates and the height and width of the image.
2014-07-16 23:29:54 -07:00
05327fbe7a Missed a few things when I…
- Removed the (viewing) angle member
- Added Up and Right vectors
2014-07-16 23:29:01 -07:00
72e93eccb3 Reformat description of OrthographicCamera::compute_primary_ray 2014-07-16 23:26:41 -07:00
8eb98270af Add Up and Right vectors to the camera 2014-07-16 23:25:54 -07:00
8336753bcf Remove pixel dimensions from camera
The scene computes those and gives them to the camera for each ray
2014-07-16 23:24:32 -07:00
ca5cabb6ef Add LinearCombination for Vectors 2014-07-16 23:23:26 -07:00
2834fa45c6 Replace dimensions code in SceneParser with a few lines of VectorParser magic
Neat!
2014-07-15 23:33:02 -07:00
bdd0afddf5 Define format strings for int and double ParseScalar() methods 2014-07-15 23:32:20 -07:00
b8d0b274b1 Implement templated VectorParser 2014-07-15 23:31:48 -07:00
d12f8c9fa6 Define ParseScalar<T> and ParseScalarTraits
For parsing single YAML scalar values into C++ datatypes (mostly ints and doubles).
2014-07-15 23:28:59 -07:00
557d9a047f Define the Notify() method on UtilityParser 2014-07-15 23:27:24 -07:00
d20e4154fe Big YAML parser cleanup 2014-07-15 17:27:27 -07:00
687de91a81 Quick 'n dirty setters for height and width 2014-07-13 20:12:10 -07:00
f59ec98035 HOLY CRAP I CAN READ DIMENSIONS FROM YAML FILES 2014-07-13 20:11:50 -07:00
6a8bcc4973 Add back a bunch of the programatic scene stuff 2014-07-13 20:11:37 -07:00
3687029bcd Parse YAML files in main() 2014-07-13 18:06:21 -07:00
b4327303ee Add YAML reader 2014-07-13 18:06:03 -07:00
357bcc19c0 Remove libyaml Makefiles 2014-07-13 09:47:51 -07:00
24b07b65f0 libyaml 2014-07-13 09:47:37 -07:00
eb0f93f476 Merge remote-tracking branch 'base/master' into develop 2014-07-13 09:23:57 -07:00
dfd57da14f Correcting some build problems with old-style SConscripts 2014-07-13 09:23:42 -07:00
a0edcab26d Comment about swapping env and build_env in do_sconscript() 2014-07-13 09:22:53 -07:00
9b00e03b2d Get rid of broken check for lib dir existence 2014-07-13 09:21:11 -07:00
882f5614ae Add build_env (as env) to sconscript environment 2014-07-13 09:12:08 -07:00
2b87d5add6 Use -O3 for production 2014-07-13 09:10:41 -07:00
61134833dc Remove gtest in top-level directory 2014-07-13 08:56:12 -07:00
391251940b Merge remote-tracking branch 'base/master' into develop
Conflicts:
	.gitignore
	SConstruct
	src/SConscript
	test/SConscript
2014-07-13 08:24:16 -07:00
3ddfd94dfa No planes 2014-07-13 07:43:18 -07:00
491972b6c2 Merge branch 'develop' 2014-07-13 07:42:08 -07:00
a2dea2a35f Add beta environment -- debug, with optimization 2014-07-13 07:42:00 -07:00
fb0f090892 Add succinct build commands, but don't use 'em yet 2014-07-04 11:09:39 -07:00
fea154a058 So much clean up...
Brought in the SConscript from Late Fish, which is where a lot of these changes
were made. Cleaned up a bunch of stuff. Moved repeated code to functions.
Implemented dynamically building libraries in lib/.
2014-07-04 10:55:34 -07:00