#5711: Add separate Q3 map writer. Move common double exporter code t…

…o shared header file.
codereader · Aug 29, 2021 · 9979ea1 · 9979ea1
1 parent 795f65f
commit 9979ea1
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 79 deletions.
diff --git a/radiantcore/map/format/Quake3MapFormat.cpp b/radiantcore/map/format/Quake3MapFormat.cpp
@@ -90,7 +90,7 @@ const std::string& Quake3MapFormat::getName() const
 
 IMapWriterPtr Quake3MapFormat::getMapWriter() const
 {
-    return std::make_shared<Quake3MapWriter>(); // TODO
+    return std::make_shared<Quake3MapWriter>();
 }
 
 // Quake 3 with alternate brush format
@@ -115,7 +115,7 @@ const std::string& Quake3AlternateMapFormat::getName() const
 
 IMapWriterPtr Quake3AlternateMapFormat::getMapWriter() const
 {
-    return std::make_shared<Quake3MapWriter>(); // TODO
+    return std::make_shared<Quake3AlternateMapWriter>();
 }
 
 module::StaticModule<Quake3MapFormat> q3MapModule;

diff --git a/radiantcore/map/format/Quake3MapWriter.h b/radiantcore/map/format/Quake3MapWriter.h
@@ -27,7 +27,7 @@ class Quake3MapWriter :
 		stream << "// brush " << _primitiveCount++ << std::endl;
 
 		// Export brushDef definition to stream
-		BrushDefExporter::exportBrush(stream, brush);
+		BrushDefExporter::exportBrush(stream, brush); // TODO
 	}
 
 	virtual void beginWritePatch(const IPatchNodePtr& patch, std::ostream& stream) override
@@ -40,4 +40,19 @@ class Quake3MapWriter :
 	}
 };
 
+class Quake3AlternateMapWriter :
+    public Doom3MapWriter
+{
+public:
+    // Q3 alternate is writing the newer brushDef syntax
+    virtual void beginWriteBrush(const IBrushNodePtr& brush, std::ostream& stream) override
+    {
+        // Primitive count comment
+        stream << "// brush " << _primitiveCount++ << std::endl;
+
+        // Export brushDef definition to stream
+        BrushDefExporter::exportBrush(stream, brush);
+    }
+};
+
 } // namespace
diff --git a/radiantcore/map/format/primitivewriters/BrushDef3Exporter.h b/radiantcore/map/format/primitivewriters/BrushDef3Exporter.h
@@ -3,34 +3,11 @@
 #include "ibrush.h"
 #include "math/Plane3.h"
 #include "math/Matrix4.h"
+#include "ExportUtil.h"
 
 namespace map
 {
 
-namespace
-{
-	// Writes a double to the given stream and checks for NaN and infinity
-	inline void writeDoubleSafe(const double d, std::ostream& os)
-	{
-		if (isValid(d))
-		{
-			if (d == -0.0)
-			{
-				os << 0; // convert -0 to 0
-			}
-			else
-			{
-				os << d;
-			}
-		}
-		else
-		{
-			// Is infinity or NaN, write 0
-			os << "0";
-		}
-	}
-}
-
 class BrushDef3Exporter
 {
 public:

diff --git a/radiantcore/map/format/primitivewriters/BrushDefExporter.h b/radiantcore/map/format/primitivewriters/BrushDefExporter.h
@@ -6,34 +6,11 @@
 #include "shaderlib.h"
 
 #include "string/predicate.h"
+#include "ExportUtil.h"
 
 namespace map
 {
 
-namespace
-{
-	// Writes a double to the given stream and checks for NaN and infinity
-	inline void writeDoubleSafe(const double d, std::ostream& os)
-	{
-		if (isValid(d))
-		{
-			if (d == -0.0)
-			{
-				os << 0; // convert -0 to 0
-			}
-			else
-			{
-				os << d;
-			}
-		}
-		else
-		{
-			// Is infinity or NaN, write 0
-			os << "0";
-		}
-	}
-}
-
 class BrushDefExporter
 {
 public:

diff --git a/radiantcore/map/format/primitivewriters/ExportUtil.h b/radiantcore/map/format/primitivewriters/ExportUtil.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <ostream>
+#include "math/FloatTools.h"
+
+namespace map
+{
+
+// Writes a double to the given stream and checks for NaN and infinity
+inline void writeDoubleSafe(const double d, std::ostream& os)
+{
+	if (isValid(d))
+	{
+		if (d == -0.0)
+		{
+			os << 0; // convert -0 to 0
+		}
+		else
+		{
+			os << d;
+		}
+	}
+	else
+	{
+		// Is infinity or NaN, write 0
+		os << "0";
+	}
+}
+
+}
diff --git a/radiantcore/map/format/primitivewriters/PatchDefExporter.h b/radiantcore/map/format/primitivewriters/PatchDefExporter.h
@@ -4,33 +4,11 @@
 #include "ipatch.h"
 
 #include "string/predicate.h"
+#include "ExportUtil.h"
 
 namespace map
 {
 
-namespace
-{
-	inline void writePatchDouble(const double d, std::ostream& os)
-	{
-		if (isValid(d))
-		{
-			if (d == -0.0)
-			{
-				os << 0; // convert -0 to 0
-			}
-			else
-			{
-				os << d;
-			}
-		}
-		else
-		{
-			// Is infinity or NaN, write 0
-			os << "0";
-		}
-	}
-}
-
 class PatchDefExporter
 {
 public:
@@ -181,15 +159,15 @@ class PatchDefExporter
 			for (std::size_t r = 0; r < patch.getHeight(); r++)
 			{
 				stream << "( ";
-				writePatchDouble(patch.ctrlAt(r,c).vertex[0], stream);
+				writeDoubleSafe(patch.ctrlAt(r,c).vertex[0], stream);
 				stream << " ";
-				writePatchDouble(patch.ctrlAt(r,c).vertex[1], stream);
+                writeDoubleSafe(patch.ctrlAt(r,c).vertex[1], stream);
 				stream << " ";
-				writePatchDouble(patch.ctrlAt(r,c).vertex[2], stream);
+                writeDoubleSafe(patch.ctrlAt(r,c).vertex[2], stream);
 				stream << " ";
-				writePatchDouble(patch.ctrlAt(r,c).texcoord[0], stream);
+                writeDoubleSafe(patch.ctrlAt(r,c).texcoord[0], stream);
 				stream << " ";
-				writePatchDouble(patch.ctrlAt(r,c).texcoord[1], stream);
+                writeDoubleSafe(patch.ctrlAt(r,c).texcoord[1], stream);
 				stream << " ) ";
 			}
 

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -847,6 +847,7 @@
     <ClInclude Include="..\..\radiantcore\map\format\primitiveparsers\PatchDef3.h" />
     <ClInclude Include="..\..\radiantcore\map\format\primitivewriters\BrushDef3Exporter.h" />
     <ClInclude Include="..\..\radiantcore\map\format\primitivewriters\BrushDefExporter.h" />
+    <ClInclude Include="..\..\radiantcore\map\format\primitivewriters\ExportUtil.h" />
     <ClInclude Include="..\..\radiantcore\map\format\primitivewriters\PatchDefExporter.h" />
     <ClInclude Include="..\..\radiantcore\map\format\Quake3MapFormat.h" />
     <ClInclude Include="..\..\radiantcore\map\format\Quake3MapReader.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2184,5 +2184,8 @@
     <ClInclude Include="..\..\radiantcore\map\autosaver\AutoSaver.h">
       <Filter>src\map\autosaver</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\format\primitivewriters\ExportUtil.h">
+      <Filter>src\map\format\primitivewriters</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>