diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2009-11-25 02:38:41 -0500 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2009-11-25 02:38:41 -0500 |
| commit | 70379f85feb3b294742d880a75fabd4452c5ecf3 (patch) | |
| tree | 7c969e5b1982cbd8f766f46805581b1140c2a96b /dimension/grammar.y | |
| parent | 7bbc14551b0513ec94bdac0eff0d64842fe55b2b (diff) | |
| download | dimension-70379f85feb3b294742d880a75fabd4452c5ecf3.tar.xz | |
Support scaling and translation transformations.
Diffstat (limited to 'dimension/grammar.y')
| -rw-r--r-- | dimension/grammar.y | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/dimension/grammar.y b/dimension/grammar.y index 2b83511..d69a5a0 100644 --- a/dimension/grammar.y +++ b/dimension/grammar.y @@ -556,7 +556,7 @@ yyerror(YYLTYPE *locp, dmnsn_array *astree, dmnsn_token_iterator *iterator, %token DMNSN_T_ROUGHNESS %token DMNSN_T_SAMPLES %token DMNSN_T_SAVE_FILE -%token DMNSN_T_SCALE +%token DMNSN_T_SCALE "scale" %token DMNSN_T_SCALLOP_WAVE %token DMNSN_T_SCATTERING %token DMNSN_T_SEED @@ -619,7 +619,7 @@ yyerror(YYLTYPE *locp, dmnsn_array *astree, dmnsn_token_iterator *iterator, %token DMNSN_T_TORUS %token DMNSN_T_TRACE %token DMNSN_T_TRANSFORM -%token DMNSN_T_TRANSLATE +%token DMNSN_T_TRANSLATE "translate" %token DMNSN_T_TRANSMIT "transmit" %token DMNSN_T_TRIANGLE %token DMNSN_T_TRIANGLE_WAVE @@ -744,6 +744,12 @@ SCENE_ITEM: OBJECT TRANSFORMATION: "rotate" VECTOR { $$ = dmnsn_new_astnode1(DMNSN_AST_ROTATION, @$, $2); } + | "scale" VECTOR { + $$ = dmnsn_new_astnode1(DMNSN_AST_SCALE, @$, $2); + } + | "translate" VECTOR { + $$ = dmnsn_new_astnode1(DMNSN_AST_TRANSLATION, @$, $2); + } /* Objects */ @@ -1374,8 +1380,10 @@ dmnsn_astnode_string(dmnsn_astnode_type astnode_type) dmnsn_astnode_map(DMNSN_AST_BOX, "box"); dmnsn_astnode_map(DMNSN_AST_VECTOR, "vector"); dmnsn_astnode_map(DMNSN_AST_SPHERE, "sphere"); - dmnsn_astnode_map(DMNSN_AST_OBJECT_MODIFIERS, "object-modifiers"); dmnsn_astnode_map(DMNSN_AST_ROTATION, "rotate"); + dmnsn_astnode_map(DMNSN_AST_SCALE, "scale"); + dmnsn_astnode_map(DMNSN_AST_TRANSLATION, "translate"); + dmnsn_astnode_map(DMNSN_AST_OBJECT_MODIFIERS, "object-modifiers"); default: fprintf(stderr, "Warning: unrecognised astnode type %d.\n", |