X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fevaluate.h;h=4ad267797152050de9e44b34605119c58484b110;hb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;hp=2c80a6cba24fd90881e85062400a052f63335a7a;hpb=30465dd3b9f55ec42c4b19c3c2077eede7237a26;p=libs%2Fgl.git diff --git a/source/glsl/evaluate.h b/source/glsl/evaluate.h index 2c80a6cb..4ad26779 100644 --- a/source/glsl/evaluate.h +++ b/source/glsl/evaluate.h @@ -16,19 +16,18 @@ public: private: const ValueMap *variable_values; - float result; - bool result_valid; + float r_result; + bool r_result_valid; public: ExpressionEvaluator(); ExpressionEvaluator(const ValueMap &); - float get_result() const { return result; } - bool is_result_valid() const { return result_valid; } + float get_result() const { return r_result; } + bool is_result_valid() const { return r_result_valid; } using NodeVisitor::visit; virtual void visit(Literal &); - virtual void visit(ParenthesizedExpression &); virtual void visit(VariableReference &); virtual void visit(UnaryExpression &); virtual void visit(BinaryExpression &);