Add NewFloat2.

Zer0xFF · Aug 1, 2016 · f4c6bce · f4c6bce
1 parent 282ebbc
commit f4c6bce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/include/nuanceur/builder/Float2Value.h b/include/nuanceur/builder/Float2Value.h
@@ -33,6 +33,7 @@ namespace Nuanceur
 	{
 	private:
 		friend CSwizzleSelector4;
+		friend CFloat2Rvalue NewFloat2(const CFloatValue& x, float y);
 
 		CFloat2Rvalue(const CFloat2Rvalue&) = default;
 

diff --git a/include/nuanceur/builder/Operations.h b/include/nuanceur/builder/Operations.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ShaderBuilder.h"
+#include "FloatValue.h"
 #include "Float2Value.h"
 #include "Float3Value.h"
 #include "Float4Value.h"
@@ -18,6 +19,8 @@ namespace Nuanceur
 
 	CFloat4Rvalue operator *(const CMatrix44Value& lhs, const CFloat4Value& rhs);
 
+	CFloat2Rvalue NewFloat2(const CFloatValue& x, float y);
+
 	CFloat4Rvalue NewFloat4(CShaderBuilder& owner, float x, float y, float z, float w);
 	CFloat4Rvalue NewFloat4(const CFloat3Value& xyz, float w);
 

diff --git a/src/builder/Operations.cpp b/src/builder/Operations.cpp
@@ -69,6 +69,17 @@ void CFloat4Lvalue::operator =(const CFloat4Rvalue& rhs)
 	);
 }
 
+CFloat2Rvalue Nuanceur::NewFloat2(const CFloatValue& x, float y)
+{
+	auto owner = x.symbol.owner;
+	auto literal = CFloat2Rvalue(owner->CreateConstant(y, 0, 0, 0), SWIZZLE_X);
+	auto temp = CFloat2Rvalue(owner->CreateTemporary());
+	owner->InsertStatement(
+		CShaderBuilder::STATEMENT(CShaderBuilder::STATEMENT_OP_NEWVECTOR2, temp, x, literal)
+	);
+	return temp;
+}
+
 CFloat4Rvalue Nuanceur::NewFloat4(CShaderBuilder& owner, float x, float y, float z, float w)
 {
 	auto literal = owner.CreateConstant(x, y, z, w);