yyparse() now a friend function to Scene, light constructors not taking position arguments any more

git-svn-id: svn://anubis/fart/trunk@104 7f9b0f55-74a9-4bce-be96-3c2cd072584d

main/Light.cc

@@ -2,10 +2,10 @@
 #include "Light.h"
 #include "util/Vector.h"
 
-Light::Light(const Vector & position)
+Light::Light()
-    : m_diffuse_color(Color::white),
-      m_specular_color(Color::white)
 {
-    m_position = position;
+    m_position = Vector(0, 0, 0);
+    m_diffuse_color = Color::white;
+    m_specular_color = Color::white;
 }
 

main/Light.h

@@ -8,7 +8,9 @@
 class Light
 {
     public:
-        Light(const Vector & position);
+        Light();
+
+        void setPosition(const Vector & position) { m_position = position; }
         const Vector & getPosition() const { return m_position; }
 
         void setDiffuseColor(const Color & diffuse)

main/PointLight.cc

@@ -1,7 +1,7 @@
 
 #include "PointLight.h"
 
-PointLight::PointLight(const Vector & position)
+PointLight::PointLight()
-    : Light(position)
+    : Light()
 {
 }

main/PointLight.h

@@ -8,7 +8,7 @@
 class PointLight : public Light
 {
     public:
-        PointLight(const Vector & position);
+        PointLight();
 
     protected:
 };

main/Scene.cc

@@ -89,7 +89,8 @@ void Scene::load(const char * filename)
     shape->setMaterial(m);
     m_shapes.push_back(shape);
 
-    refptr<Light> light = new PointLight(Vector(2, -1, 2));
+    refptr<Light> light = new PointLight();
+    light->setPosition(Vector(2, -1, 2));
     m_lights.push_back(light);
 }
 

main/Scene.h

@@ -39,6 +39,8 @@ class Scene
         void setAmbientLight(const Color & al) { m_ambient_light = al; }
         Transform & getTransform() { return m_transform; }
 
+        friend int yyparse();
+
     protected:
         /* private methods */
         void load(const char * filename);

parser/parser.lex

@@ -38,6 +38,7 @@ camera              return CAMERA;
 diffuse             return DIFFUSE;
 height              return HEIGHT;
 intersect           return INTERSECT;
+light               return LIGHT;
 look_at             return LOOKAT;
 material            return MATERIAL;
 multisample         return MULTISAMPLE;

parser/parser.yy

@@ -45,11 +45,14 @@ enum Node_Type
 {
     Node_Shape = 0x42001,           /* don't clash with bison token namespace */
     Node_Camera,
-    Node_Options
+    Node_Options,
+    Node_Light
 };
 
 #define YYSTYPE refptr<Node>
 
+static Scene * g_scene;
+
 %}
 
 %token PLUS;
@@ -85,6 +88,7 @@ enum Node_Type
 %token DIFFUSE;
 %token HEIGHT;
 %token INTERSECT;
+%token LIGHT;
 %token LOOKAT;
 %token MATERIAL;
 %token MULTISAMPLE;
@@ -111,6 +115,18 @@ scene: SCENE LCURLY scene_items RCURLY {
             {
                 /* process this scene item */
                 refptr<Node> thisNode = node->the_Node;
+                switch (thisNode->type)
+                {
+                case Node_Shape:
+                    g_scene->m_shapes.push_back(thisNode->the_Shape);
+                    break;
+                case Node_Camera:
+                    break;
+                case Node_Light:
+                    break;
+                case Node_Options:
+                    break;
+                }
                 node = node->the_tail;
             }
         }
@@ -172,6 +188,47 @@ camera_item: POSITION vector {
 intersect: INTERSECT LCURLY boolean_items RCURLY
          ;
 
+light: LIGHT LCURLY light_items RCURLY {
+            $$ = new Node();
+            refptr<Light> light = new Light();
+            refptr<Node> node = $3;
+            while ( ! node.isNull() )
+            {
+                switch (node->type)
+                {
+                case POSITION:
+                    break;
+                }
+                node = node->the_tail;
+            }
+        }
+     ;
+
+light_items: /* empty */
+           | light_item light_items {
+                $$ = new Node();
+                $$->the_Node = $1;
+                $$->the_tail = $2;
+            }
+           ;
+
+light_item: POSITION vector {
+                $$ = new Node();
+                $$->type = POSITION;
+                $$->the_Vector = $2->the_Vector;
+            }
+          | DIFFUSE vector {
+                $$ = new Node();
+                $$->type = DIFFUSE;
+                $$->the_Color = new Color(* $2->the_Vector);
+            }
+          | SPECULAR vector {
+                $$ = new Node();
+                $$->type = SPECULAR;
+                $$->the_Color = new Color(* $2->the_Vector);
+            }
+          ;
+
 material: MATERIAL LCURLY material_items RCURLY {
                 $$ = new Node();
                 refptr<Material> material = new Material();
@@ -302,6 +359,7 @@ scene_items: /* empty */
 scene_item: camera { $$ = $1; $$->type = Node_Camera; }
           | shape { $$ = $1; $$->type = Node_Shape; }
           | options { $$ = $1; $$->type = Node_Options; }
+          | light { $$ = $1; $$->type = Node_Light; }
           ;
 
 shape: plane { $$ = $1; }
@@ -346,6 +404,7 @@ vector: LESS number COMMA number COMMA number GREATER {
 
 int Scene::parse(const char * fileName)
 {
+    g_scene = this;
     yyin = fopen(fileName, "r");
     if (yyin == NULL)
     {