diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2010-04-10 22:09:45 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2010-04-10 22:27:56 -0400 |
| commit | 26a6f5d017be9ec0ec03cd20d082546a4e435746 (patch) | |
| tree | 75dc9e989945e5b15909328d5a910646bf72abaa /dimension/common.rules | |
| parent | 0f356fe6d666b7f43b5b6f4565fe0b890228a75d (diff) | |
| download | dimension-26a6f5d017be9ec0ec03cd20d082546a4e435746.tar.xz | |
Improve CSG and light handling.
- Lights can be inside CSG objects
- Lights can be modified by transformations
- CSG objects can contain only one object
Diffstat (limited to 'dimension/common.rules')
| -rw-r--r-- | dimension/common.rules | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dimension/common.rules b/dimension/common.rules index e604b9f..c5f9eea 100644 --- a/dimension/common.rules +++ b/dimension/common.rules @@ -236,8 +236,8 @@ MERGE: "merge" "{" } ; -OBJECTS: OBJECT OBJECT { - $$ = dmnsn_new_astnode2(DMNSN_AST_ARRAY, @$, $1, $2); +OBJECTS: OBJECT { + $$ = dmnsn_new_astnode1(DMNSN_AST_ARRAY, @$, $1); } | OBJECTS OBJECT { $$ = $1; @@ -246,9 +246,10 @@ OBJECTS: OBJECT OBJECT { LIGHT_SOURCE: "light_source" "{" VECTOR "," COLOR + OBJECT_MODIFIERS "}" { - $$ = dmnsn_new_astnode2(DMNSN_AST_LIGHT_SOURCE, @$, $3, $5); + $$ = dmnsn_new_astnode3(DMNSN_AST_LIGHT_SOURCE, @$, $3, $5, $6); } ; |