fixed parser bug with sphere_items, made VFOVNode inherit from NumberNode, updated sample scene infinity.fart, reading scene from a file appears to be working!
git-svn-id: svn://anubis/fart/trunk@175 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
1 parent
84f6b04cd7
commit
10500d08aa
3 files changed
+19
-13
No files matched your search
+3
-1
@@ -266,8 +266,10 @@ class UpNode : public VectorNode
|
||||
UpNode(refptr<Vector> vector) : VectorNode(vector) {}
|
||||
};
|
||||
|
||||
class VFOVNode : public Node
|
||||
class VFOVNode : public NumberNode
|
||||
{
|
||||
public:
|
||||
VFOVNode(double d) : NumberNode(d) {}
|
||||
};
|
||||
|
||||
class WidthNode : public IntegerNode
|
||||
|
||||
+3
-4
@@ -141,9 +141,8 @@ camera_item: POSITION vector {
|
||||
| UP vector {
|
||||
$$ = new UpNode($2->getVector());
|
||||
}
|
||||
| VFOV vector {
|
||||
$$ = new VFOVNode();
|
||||
$$->addChild($2);
|
||||
| VFOV number {
|
||||
$$ = new VFOVNode($2->getNumber());
|
||||
}
|
||||
;
|
||||
|
||||
@@ -329,7 +328,7 @@ shape_item: material { $$ = $1; }
|
||||
|
||||
sphere: SPHERE LCURLY sphere_items RCURLY {
|
||||
$$ = new SphereNode();
|
||||
$$->addChild($3);
|
||||
$$->addChildren($3);
|
||||
}
|
||||
;
|
||||
|
||||
|
||||
Reference in new issue
Block a user