Add support for more operations.

Zer0xFF · Aug 24, 2016 · 91483f8 · 91483f8
1 parent 5fa914b
commit 91483f8
Show file tree

Hide file tree

Showing 6 changed files with 34 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 operator /(const CFloat2Value&, const CFloat2Value&);
 		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
@@ -19,6 +19,7 @@ namespace Nuanceur
 	CFloat4Rvalue operator *(const CFloat4Value& lhs, const CFloat4Value& rhs);
 
 	CFloatRvalue operator /(const CFloatValue& lhs, const CFloatValue& rhs);
+	CFloat2Rvalue operator /(const CFloat2Value& lhs, const CFloat2Value& rhs);
 
 	CFloat4Rvalue operator *(const CMatrix44Value& lhs, const CFloat4Value& rhs);
 

diff --git a/include/nuanceur/builder/ShaderBuilder.h b/include/nuanceur/builder/ShaderBuilder.h
@@ -31,6 +31,7 @@ namespace Nuanceur
 		SWIZZLE_XY,
 		SWIZZLE_XZ,
 		SWIZZLE_XW,
+		SWIZZLE_ZZ,
 
 		SWIZZLE_XYZ,
 

diff --git a/include/nuanceur/builder/SwizzleSelector4.h b/include/nuanceur/builder/SwizzleSelector4.h
@@ -21,11 +21,21 @@ namespace Nuanceur
 			return CFloatRvalue(m_symbol, SWIZZLE_X);
 		}
 
+		CFloatRvalue z() const
+		{
+			return CFloatRvalue(m_symbol, SWIZZLE_Z);
+		}
+
 		CFloat2Rvalue xy() const
 		{
 			return CFloat2Rvalue(m_symbol, SWIZZLE_XY);
 		}
 
+		CFloat2Rvalue zz() const
+		{
+			return CFloat2Rvalue(m_symbol, SWIZZLE_ZZ);
+		}
+
 		CFloat3Rvalue xyz() const
 		{
 			return CFloat3Rvalue(m_symbol, SWIZZLE_XYZ);

diff --git a/src/builder/Operations.cpp b/src/builder/Operations.cpp
@@ -71,6 +71,16 @@ CFloatRvalue Nuanceur::operator /(const CFloatValue& lhs, const CFloatValue& rhs
 	return temp;
 }
 
+CFloat2Rvalue Nuanceur::operator /(const CFloat2Value& lhs, const CFloat2Value& rhs)
+{
+	auto owner = GetCommonOwner(lhs.symbol, rhs.symbol);
+	auto temp = CFloat2Rvalue(owner->CreateTemporary());
+	owner->InsertStatement(
+		CShaderBuilder::STATEMENT(CShaderBuilder::STATEMENT_OP_DIVIDE, temp, lhs, rhs)
+	);
+	return temp;
+}
+
 CFloat4Rvalue Nuanceur::operator *(const CMatrix44Value& lhs, const CFloat4Value& rhs)
 {
 	auto owner = GetCommonOwner(lhs.symbol, rhs.symbol);
@@ -89,6 +99,14 @@ void CFloatLvalue::operator =(const CFloatRvalue& rhs)
 	);
 }
 
+void CFloat2Lvalue::operator =(const CFloat2Rvalue& rhs)
+{
+	auto owner = rhs.symbol.owner;
+	owner->InsertStatement(
+		CShaderBuilder::STATEMENT(CShaderBuilder::STATEMENT_OP_ASSIGN, *this, rhs)
+	);
+}
+
 void CFloat4Lvalue::operator =(const CFloat4Rvalue& rhs)
 {
 	auto owner = rhs.symbol.owner;

diff --git a/src/generators/HlslShaderGenerator.cpp b/src/generators/HlslShaderGenerator.cpp
@@ -362,6 +362,9 @@ std::string CHlslShaderGenerator::PrintSymbolRef(const CShaderBuilder::SYMBOLREF
 	case SWIZZLE_XZ:
 		return symbolName + ".xz";
 		break;
+	case SWIZZLE_ZZ:
+		return symbolName + ".zz";
+		break;
 	case SWIZZLE_XYZ:
 		return symbolName + ".xyz";
 		break;