From 26a6f5d017be9ec0ec03cd20d082546a4e435746 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Sat, 10 Apr 2010 22:09:45 -0400
Subject: Improve CSG and light handling.

- Lights can be inside CSG objects
- Lights can be modified by transformations
- CSG objects can contain only one object
---
 dimension/common.rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'dimension/common.rules')

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);
             }
 ;
 
-- 
cgit v1.2.3