372 Commits

Author SHA1 Message Date
Josh Holtrop
cd2f565df3 introduced ScaleScalarNode() node type to avoid evaluating expression multiple times
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@327 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-10-01 15:01:51 +00:00
Josh Holtrop
741ca57e11 added assignment expressions, for loop nodes, boolean expressions, ForNode class, BoolExpressionNode class, AssignmentNode class
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@326 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 21:33:22 +00:00
Josh Holtrop
442a7bdeda added VARREF in lexer matching $[a-zA-Z_][a-zA-Z_0-9]*, added VarRefNode class
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@325 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 20:59:26 +00:00
Josh Holtrop
35d6e536ae removed optional negative sign preceding number literals in lexer since it was interfering with minus operator with no whitespace
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@324 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 20:55:02 +00:00
Josh Holtrop
26d8d1a081 fixed NumberNode storing the expression as a child node
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@323 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 20:33:11 +00:00
Josh Holtrop
f54446bd6a fixed Ngon using an expression for n_sides and implementing getInteger()
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@322 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 20:16:33 +00:00
Josh Holtrop
bd60471dfa fixed VectorNode storing expression nodes as children instead of class members; fixed JitterNode not implementing getInteger()
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@321 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 20:09:36 +00:00
Josh Holtrop
83fd083af8 removed annoying consts
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@320 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 19:58:21 +00:00
Josh Holtrop
1afa2b6510 fixed parser/nodes.h node classes not specifying "const" when overriding methods
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@319 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 19:47:38 +00:00
Josh Holtrop
2f825f29f9 moved computation of numbers and vectors from parser.yy to Scene-load.cc
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@318 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 19:30:14 +00:00
Josh Holtrop
36d59ba575 changed elapsed time output to "Render time"
git-svn-id: svn://anubis/fart/trunk@317 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-29 15:32:59 +00:00
Josh Holtrop
106c009731 messing with scenes/dw.fart more
git-svn-id: svn://anubis/fart/trunk@316 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 20:48:19 +00:00
Josh Holtrop
20017370f0 added expression production to grammar, changed grammar refs from number to expression, added BinOpNode class, currently segfaulting :(
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@315 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 20:39:42 +00:00
Josh Holtrop
cb907de438 cut scene-file-scripting branch
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@314 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 20:38:17 +00:00
Josh Holtrop
ecd5f44207 messing with scenes/dw.fart more
git-svn-id: svn://anubis/fart/trunk@313 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 19:49:14 +00:00
Josh Holtrop
e5e4f991fb added optional block following shape references which can contain transforms or materials specific to the shape instance
git-svn-id: svn://anubis/fart/trunk@312 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 19:31:26 +00:00
Josh Holtrop
f67707e666 messing with scenes/dw.fart
git-svn-id: svn://anubis/fart/trunk@311 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 19:05:46 +00:00
Josh Holtrop
ad6ef8f315 moved some Matrix and Transform functionality into header files
git-svn-id: svn://anubis/fart/trunk@310 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 18:18:42 +00:00
Josh Holtrop
9fd9c5774e removed a few emtpy Vector x; statements
git-svn-id: svn://anubis/fart/trunk@309 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 17:53:31 +00:00
Josh Holtrop
835a0c968f moved a bunch of functionality from Ray.cc and Color.cc into Ray.h and Color.h
git-svn-id: svn://anubis/fart/trunk@308 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 17:16:39 +00:00
Josh Holtrop
3f0d6cd83e moved most Vector functionality into the header so it could be inlined
git-svn-id: svn://anubis/fart/trunk@307 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 16:55:39 +00:00
Josh Holtrop
9e4191fb61 added AABB class, calculating AABB in Extrude objects, added Extrude intersect() optimization to throw out rays not hitting the AABB
git-svn-id: svn://anubis/fart/trunk@306 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 16:37:27 +00:00
Josh Holtrop
437fa8b07a added Box intersect() optimization... ~2% faster
git-svn-id: svn://anubis/fart/trunk@305 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 15:52:52 +00:00
Josh Holtrop
138c90c2c3 optimized intersect() test for Subtract and Intersect boolean objects to not attempt intersecting with object B when object A had no intersections.... had about a 26% speed improvement for DW test scene
git-svn-id: svn://anubis/fart/trunk@304 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 14:22:25 +00:00
Josh Holtrop
f337831df6 updated todo
git-svn-id: svn://anubis/fart/trunk@303 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-28 02:30:32 +00:00
Josh Holtrop
1544ecb311 updated .todo
git-svn-id: svn://anubis/fart/trunk@302 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-27 21:23:36 +00:00
Josh Holtrop
02077ffc7c added cutout plane to dw logo scene
git-svn-id: svn://anubis/fart/trunk@301 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-27 18:49:25 +00:00
Josh Holtrop
16b991cd85 fixed extrudes to be translated so entire DW logo is lined up
git-svn-id: svn://anubis/fart/trunk@300 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-27 18:30:28 +00:00
Josh Holtrop
1d9dfd6858 fixed cyl offsets in DW logo to avoid 0-thickness subtracts
git-svn-id: svn://anubis/fart/trunk@299 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-27 15:13:17 +00:00
Josh Holtrop
e42599612f added DW logo scene file
git-svn-id: svn://anubis/fart/trunk@298 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-09-26 21:38:43 +00:00
Josh Holtrop
42c669fe4a merged in parser-comments branch
git-svn-id: svn://anubis/fart/trunk@296 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-15 17:15:45 +00:00
Josh Holtrop
28382777ac updated .todo
git-svn-id: svn://anubis/fart/branches/parser-comments@295 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-15 17:10:54 +00:00
Josh Holtrop
01671e9486 added vim syntax for comments, added sample comments to scene file
git-svn-id: svn://anubis/fart/branches/parser-comments@294 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-15 17:10:10 +00:00
Josh Holtrop
a4e85f8eff added comments to lexer
git-svn-id: svn://anubis/fart/branches/parser-comments@293 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-15 17:04:12 +00:00
Josh Holtrop
4cd288a66f cut parser-comments branch
git-svn-id: svn://anubis/fart/branches/parser-comments@292 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-15 17:00:24 +00:00
Josh Holtrop
838cddcbb2 added shape-definitions sample scene
git-svn-id: svn://anubis/fart/trunk@289 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 20:07:31 +00:00
Josh Holtrop
a92a84ac96 updated .todo
git-svn-id: svn://anubis/fart/trunk@288 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 19:45:45 +00:00
Josh Holtrop
b0dfa2ee1f bool sub-objects using relative coordinates, shape definitions using relative coordinates, this allows transform blocks in each, and shape references to combine absolute transform with the relative transform
git-svn-id: svn://anubis/fart/trunk@287 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 19:37:05 +00:00
Josh Holtrop
b4a2c8ef8e allowing transform blocks inside boolean shapes, but using a shape reference to a boolean shape does not propagate transform properly
git-svn-id: svn://anubis/fart/trunk@286 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 18:33:26 +00:00
Josh Holtrop
fc2c62d5ac added shape vim keyword
git-svn-id: svn://anubis/fart/trunk@285 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 17:18:07 +00:00
Josh Holtrop
c1f39da3e2 added shape definition processing and shape cloning capabilities
git-svn-id: svn://anubis/fart/trunk@284 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 17:11:14 +00:00
Josh Holtrop
5308913bdb added shape definitions into parser, not using them yet
git-svn-id: svn://anubis/fart/trunk@283 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 16:35:16 +00:00
Josh Holtrop
340742d27b added command-line options --ambient-occlusion and --preview, console displays max depth parameter
git-svn-id: svn://anubis/fart/trunk@282 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 16:18:51 +00:00
Josh Holtrop
17d69c54ce Polygon objects now prune adjacent points that are the same -- no more fuzzies in extrudes with offsets of 0
git-svn-id: svn://anubis/fart/trunk@281 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-09 14:29:17 +00:00
Josh Holtrop
d2b37a1687 updated extrudes scene, fixed Extrude objects to return backfaces so that boolean objects work properly
git-svn-id: svn://anubis/fart/trunk@280 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 19:01:00 +00:00
Josh Holtrop
53ebaeec3e end caps on extrudes working!
git-svn-id: svn://anubis/fart/trunk@279 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 18:33:39 +00:00
Josh Holtrop
da47ae6fd3 fixed rendering of Extrude edges... caps still not working
git-svn-id: svn://anubis/fart/trunk@278 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 17:09:51 +00:00
Josh Holtrop
d0fe38566c added mult() and div() to Vector
git-svn-id: svn://anubis/fart/trunk@277 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 16:55:30 +00:00
Josh Holtrop
9546c8dde4 updated some Vector operations and made them member functions
git-svn-id: svn://anubis/fart/trunk@276 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 16:39:34 +00:00
Josh Holtrop
cb4c84ee66 Extrude properly sorts returned intersections
git-svn-id: svn://anubis/fart/trunk@275 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2010-07-08 15:36:22 +00:00