Added support for x:y?z conditional expressions

pratikv · Oct 5, 2011 · 14b5bab · 14b5bab
1 parent 5f66df7
commit 14b5bab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/IIS.SLSharp/Translation/GLSL/GlslVisitor.Unimplemented.cs b/IIS.SLSharp/Translation/GLSL/GlslVisitor.Unimplemented.cs
@@ -22,11 +22,6 @@ public override StringBuilder VisitBaseReferenceExpression(BaseReferenceExpressi
             return null;
         }
 
-        public override StringBuilder VisitConditionalExpression(ConditionalExpression conditionalExpression, int data)
-        {
-            throw new NotImplementedException();
-        }
-
         public override StringBuilder VisitDefaultValueExpression(DefaultValueExpression defaultValueExpression, int data)
         {
             throw new NotImplementedException();

diff --git a/IIS.SLSharp/Translation/GLSL/GlslVisitor.cs b/IIS.SLSharp/Translation/GLSL/GlslVisitor.cs
@@ -559,5 +559,13 @@ public override StringBuilder VisitDirectionExpression(DirectionExpression direc
             // this just passes through
             return directionExpression.Expression.AcceptVisitor(this, data);
         }
+
+        public override StringBuilder VisitConditionalExpression(ConditionalExpression conditionalExpression, int data)
+        {
+            var result = conditionalExpression.Condition.AcceptVisitor(this, data);
+            var trueCond = conditionalExpression.TrueExpression.AcceptVisitor(this, data);
+            var falseCond = conditionalExpression.FalseExpression.AcceptVisitor(this, data);
+            return result.Append(" ? ").Append(trueCond).Append(" : ").Append(falseCond);
+        }
     }
 }
diff --git a/IIS.SLSharp/Translation/HLSL/HlslVisitor.Unimplemented.cs b/IIS.SLSharp/Translation/HLSL/HlslVisitor.Unimplemented.cs
@@ -22,11 +22,6 @@ public override StringBuilder VisitBaseReferenceExpression(BaseReferenceExpressi
             return null;
         }
 
-        public override StringBuilder VisitConditionalExpression(ConditionalExpression conditionalExpression, int data)
-        {
-            throw new NotImplementedException();
-        }
-
         public override StringBuilder VisitDefaultValueExpression(DefaultValueExpression defaultValueExpression, int data)
         {
             throw new NotImplementedException();

diff --git a/IIS.SLSharp/Translation/HLSL/HlslVisitor.cs b/IIS.SLSharp/Translation/HLSL/HlslVisitor.cs
@@ -610,5 +610,13 @@ public override StringBuilder VisitDirectionExpression(DirectionExpression direc
             // this just passes through
             return directionExpression.Expression.AcceptVisitor(this, data);
         }
+
+        public override StringBuilder VisitConditionalExpression(ConditionalExpression conditionalExpression, int data)
+        {
+            var result = conditionalExpression.Condition.AcceptVisitor(this, data);
+            var trueCond = conditionalExpression.TrueExpression.AcceptVisitor(this, data);
+            var falseCond = conditionalExpression.FalseExpression.AcceptVisitor(this, data);
+            return result.Append(" ? ").Append(trueCond).Append(" : ").Append(falseCond);
+        }
     }
 }