josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed Ngon using an expression for n_sides and implementing getInteger()

Browse Source 
git-svn-id: svn://anubis/fart/branches/scene-file-scripting@322 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2010-09-29 20:16:33 +00:00
parent bd60471dfa
commit f54446bd6a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
parser/nodes.h
View File

@ -236,6 +236,7 @@ class NGonNode : public NumberNode
{ {
public: public:
NGonNode(refptr<Node> e) : NumberNode(e) {} NGonNode(refptr<Node> e) : NumberNode(e) {}
int getInteger() { return getNumber(); }
}; };
class OffsetNode : public NumberNode class OffsetNode : public NumberNode

2
parser/parser.yy
View File

@ -314,7 +314,7 @@ number: DEC_NUMBER { $$ = $1; }
| REAL_NUMBER { $$ = $1; } | REAL_NUMBER { $$ = $1; }
; ;
ngon: NGON DEC_NUMBER COMMA expression { ngon: NGON expression COMMA expression {
$$ = new NGonNode($2); $$ = new NGonNode($2);
$$->addChild(new RadiusNode($4)); $$->addChild(new RadiusNode($4));
} }