091fcadd39added -d flag to usage information
Josh Holtrop
2009-03-10 18:29:45 +00:00
79f8f347e4updated .todo yet again
Josh Holtrop
2009-03-10 02:12:25 +00:00
462f6f47e8updated .todo again
Josh Holtrop
2009-03-10 02:11:55 +00:00
72a5023539updated Makefiles to not print the "*.dep: No such file or directory" warnings
Josh Holtrop
2009-03-10 01:54:23 +00:00
9f9ce1a8f5added maximum depth command-line argument (-d) and scene option (max_depth); prettified elapsed time output when greater than 60 seconds
Josh Holtrop
2009-03-10 00:01:21 +00:00
4716b200fdmerged in branches/2009-03-09_intersect_returning_normals
Josh Holtrop
2009-03-09 23:24:01 +00:00
51c5baf59aupdated subtract-subtract.fart and .todo
Josh Holtrop
2009-03-09 23:21:23 +00:00
60b29d658dmodified shapes and Scene to return surface normal in the intersect object
Josh Holtrop
2009-03-09 23:17:31 +00:00
1ad08d9998cleaning up shapes/Cyl a bit
Josh Holtrop
2009-03-07 19:17:47 +00:00
feeaa34d62tweaked Scene::calculateLightContribution() and scenes/cyls.fart slightly
Josh Holtrop
2009-03-07 18:38:40 +00:00
608939bff4Scene-load setting light position based on the current transform
Josh Holtrop
2009-03-06 23:32:00 +00:00
24ef1eca3cadded scenes/trans-boxes.fart, changed Scene to consider all back-faces as front-faces by inverting the normal vector, fixed bug in Scene::calculateLightContribution() which was messing up shadow values and back-face intensities for transparent objects
Josh Holtrop
2009-03-06 19:12:26 +00:00
b50c4de1bcadded parser, nodes, Scene-load support for transparency in materials
Josh Holtrop
2009-03-05 20:04:13 +00:00
f9cf1381a6working on shadows but they are appearing in weird places...
Josh Holtrop
2009-03-04 02:03:21 +00:00
e5cae862ebupdated sample scenes with reflections
Josh Holtrop
2009-03-03 04:37:09 +00:00
e233056880added Color::operator*=(), added jitter computation to reflectance and transparency recursion, recursing now but there is still a jitter or recursion issue
Josh Holtrop
2009-03-03 04:30:46 +00:00
1f00625379made verbose the default option
Josh Holtrop
2009-03-03 03:22:12 +00:00
bb5eb07c75fixed bug in material definitions, added them to cyls.fart, they are working now!
Josh Holtrop
2009-03-03 03:06:56 +00:00
31e2604f98Scene-load.cc handling material definitions
Josh Holtrop
2009-03-03 02:56:33 +00:00
fce4d82a73added material definitions to parser
Josh Holtrop
2009-03-03 02:30:43 +00:00
56a5fa6166added cyls.fart sample scene, removed hard-coded scene from Scene-load.cc; reading from a file is working!
Josh Holtrop
2009-03-02 00:41:27 +00:00
10500d08aafixed parser bug with sphere_items, made VFOVNode inherit from NumberNode, updated sample scene infinity.fart, reading scene from a file appears to be working!
Josh Holtrop
2009-03-02 00:25:41 +00:00
84f6b04cd7removed static const Material::white (had a problem with C++ since the order that the static const constructors were being called in was not correct according to the order that the code depended on them), made Shape constructor use a common default material instead of recreating one every time
Josh Holtrop
2009-03-02 00:17:56 +00:00
6a649ecac7fixed Lighting to ignore dot products less than 0 for diffuse coefficients; this broke shapes/Subtract again. fixed Material::white to be assigned to by Material() as evidently it was not calling the constructor properly otherwise. added initializer in Material::Material() to set ambient color to white. Scene constructing PointLight instead of a raw Light when loading from a file
Josh Holtrop
2009-03-01 23:50:53 +00:00
adf7997417added .todo file, commented out hard-coded sample scene
Josh Holtrop
2009-03-01 22:52:51 +00:00
65c447f85afilled out Scene::processLight(), added color keyword to light specification
Josh Holtrop
2009-03-01 22:41:23 +00:00
0ea6e96e0afilled out Scene::processTransformBlock()
Josh Holtrop
2009-03-01 22:31:42 +00:00
84249c8231filled in Scene::processOptions()
Josh Holtrop
2009-02-28 23:22:36 +00:00
32fcafc687filled out Scene::processBool() to handle all boolean shapes; added Node::isShape() virtual function to determine whether a node object represents a shape node
Josh Holtrop
2009-02-28 21:22:30 +00:00
5a83786103filled out Scene::processPlane()
Josh Holtrop
2009-02-28 20:39:29 +00:00
e40677ba77added "cyl" token to parser and parser rules for cyl object
Josh Holtrop
2009-02-28 20:32:23 +00:00
0462a2e7bcworking on Scene::process*() functions to load the scene from a file
Josh Holtrop
2009-02-28 19:59:22 +00:00
1924bea5cfadded color token to parser for specifying both diffuse and ambient color in a material, added ColorNode, switched color nodes to inherit from VectorNode
Josh Holtrop
2009-02-28 18:25:12 +00:00
44ba550f68moved sample scene a bit, reset plane color to white, showing a Subtract object in the sample scene
Josh Holtrop
2009-02-28 17:10:20 +00:00
9ef826df43fixed bug in shapes/Plane which would return negative results, fixed bug in main/Scene which would not check for shape to be non-null after calling getRayClosestHit()
Josh Holtrop
2009-02-28 17:07:30 +00:00
c78e5941c8stubbed out recursion, changed Scene::getRayHits() to Scene::getRayClosestHit()
Josh Holtrop
2009-02-28 16:16:40 +00:00
5035c80d94Subtract working, but reflected normals being returned... and where did my plane and cyl go?
Josh Holtrop
2009-02-28 00:06:12 +00:00
ef25fe4a5badded Subtract, including Union and Subtract in Shape.h
Josh Holtrop
2009-02-27 22:43:49 +00:00
5af3f0decai think i have union working, need to test after transparency is working
Josh Holtrop
2009-02-27 22:29:27 +00:00
27cea5e702added Union shape based on Intersect
Josh Holtrop
2009-02-27 18:34:08 +00:00
527dc6f1dcadded virtual ~Solver() in util/Solver to avoid compiler warnings
Josh Holtrop
2009-02-24 03:05:43 +00:00
bcbec65a8fconverted shapes/Intersect::intersect() to using BoolIntersectionList
Josh Holtrop
2009-02-24 03:04:26 +00:00
2e6c62a032working on Intersect::intersect()
Josh Holtrop
2009-02-24 02:17:22 +00:00
7d64dd745dgot Shape::IntersectionList::merge() to sort the result with IntersectionComparator successfully
Josh Holtrop
2009-02-24 00:38:09 +00:00
25d6432dbdtrying to get a custom comparator to sort my IntersectionList after a merge()
Josh Holtrop
2009-02-23 22:26:46 +00:00
56278a8337changed IntersectionList into a class so i could add merge()
Josh Holtrop
2009-02-23 21:39:56 +00:00
5f18370846merged /branches/2009-02-23_Shape_IntersectList_Update into trunk
Josh Holtrop
2009-02-23 20:37:57 +00:00
ab2832a660fixed compile issues with switch to new Shape::IntersectionList
Josh Holtrop
2009-02-23 20:26:45 +00:00
0c7f85db96updating IntersectList to new Shape::IntersectionList format
Josh Holtrop
2009-02-23 20:24:30 +00:00
3b3a153559created 2009-02-23_Shape_IntersectList_Update branch for changing Shape::IntersectList into a vector of Intersections, which contain both a pointer to the actual underlying Shape object and the vector for the intersection point. This will be necessary to support boolean objects.
Josh Holtrop
2009-02-23 19:09:36 +00:00
e23d5cdca4added shapes/Intersect, need to rework IntersectList
Josh Holtrop
2009-02-23 05:51:51 +00:00
29b60f346eadded process*() functions in Scene-load.cc for various shape types
Josh Holtrop
2009-02-21 14:36:18 +00:00
395161eb66parser.lex keeping track of line number now
Josh Holtrop
2009-02-18 02:10:27 +00:00
76260a7696bison yyerror() passing yylloc to errFunc() but line number is coming out as 1
Josh Holtrop
2009-02-18 01:57:50 +00:00
aaaac6d887added location directives to flex and bison sources
Josh Holtrop
2009-02-18 01:35:09 +00:00
b9cc1fe9f9added Scene::processNode() and Scene::processChildren()
Josh Holtrop
2009-02-18 01:10:57 +00:00
30932d00e9Scene::load() calling parse() now
Josh Holtrop
2009-02-17 23:40:09 +00:00
b0014e34d1made parsed_scene_node static to parser, parse() returns refptr<Node> now
Josh Holtrop
2009-02-17 23:31:19 +00:00
f3e522262bremoved knowledge of domain types from parser, removed process() from Node, added a global refptr<Node> object, took parse(fileName) out of Scene class
Josh Holtrop
2009-02-17 22:59:53 +00:00
a8e898e445changed DEC_NUMBER from generating a NumberNode to an IntegerNode in parser.lex
Josh Holtrop
2009-02-17 14:15:34 +00:00
4b0f506522added Color::yellow, finished shapes/Box, added a couple boxes to sample scene
Josh Holtrop
2009-02-17 05:36:48 +00:00
13fedccf4cupdated svn:ignore on parser directory for C++ version of flex output file
Josh Holtrop
2009-02-17 05:21:06 +00:00
0e22a21637added TranslateNode, RotateNode, and ScaleNode
Josh Holtrop
2009-02-17 03:25:53 +00:00
2a816c1c1aadded parser/parser.h for a common YYSTYPE definition location
Josh Holtrop
2009-02-17 02:13:24 +00:00
ecc06433fcflex output compiling with g++
Josh Holtrop
2009-02-17 01:37:39 +00:00
6e67597dc7commit before attempting to compile flex scanner with C++ instead of C
Josh Holtrop
2009-02-17 01:29:25 +00:00
3aed1c21cafilled out tree-building code for all parser nodes
Josh Holtrop
2009-02-17 00:58:08 +00:00
5d7a230ee3using -O2 which avoids "might be used uninitialized" compiler warnings, added *.dep to svn:ignore for parser directory
Josh Holtrop
2009-02-16 21:51:45 +00:00
70c4785b43fixed up bison conflicts in grammar
Josh Holtrop
2009-02-16 21:20:05 +00:00
71a55378c4fixed a few compiler warnings, have a few more to go
Josh Holtrop
2009-02-16 21:06:19 +00:00