1. filipkunc
  2. MeshMaker

Commits

unknown  committed 2df23df

Fixed compilation on Windows port.

  • Participants
  • Parent commits 14f1034
  • Branches master

Comments (0)

Files changed (5)

File Classes/Exceptions.h

View file
  • Ignore whitespace
 
 #include <exception>
 
-struct UnsupportedImageFormatException : std::exception
+namespace MeshMaker
 {
-    virtual const char* what() const throw() { return "UnsupportedImageFormat"; }
-};
+	struct UnsupportedImageFormatException : std::exception
+	{
+		virtual const char* what() const throw() { return "UnsupportedImageFormat"; }
+	};
 
-struct IndexOutOfRangeException : std::exception
-{
-    virtual const char* what() const throw() { return "IndexOutOfRangeException"; }
-};
+	struct IndexOutOfRangeException : std::exception
+	{
+		virtual const char* what() const throw() { return "IndexOutOfRangeException"; }
+	};
+}
 

File Classes/Texture.cpp

View file
  • Ignore whitespace
 		else if (components == 4)
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 		else
-			throw UnsupportedImageFormatException();
+			throw MeshMaker::UnsupportedImageFormatException();
 	}
 	
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

File Classes/Triangle.cpp

View file
  • Ignore whitespace
     if (index < count())
         return _nodes[index];
 
-    throw IndexOutOfRangeException();
+    throw MeshMaker::IndexOutOfRangeException();
 }
 
 Triangle2::PackedNode &Triangle2::node(uint index)
     if (index < count())
         return _nodes[index];
 
-	throw IndexOutOfRangeException();
+	throw MeshMaker::IndexOutOfRangeException();
 }
 
 void TriangleNode::addToVertices()

File MeshMakerCppCLI/MeshMakerCppCLI.vcxproj

View file
  • Ignore whitespace
   <ItemGroup>
     <ClInclude Include="..\Classes\Camera.h" />
     <ClInclude Include="..\Classes\Enums.h" />
+    <ClInclude Include="..\Classes\Exceptions.h" />
     <ClInclude Include="..\Classes\FPArrayCache.h" />
     <ClInclude Include="..\Classes\FPList.h" />
     <ClInclude Include="..\Classes\FPNode.h" />

File MeshMakerCppCLI/MeshMakerCppCLI.vcxproj.filters

View file
  • Ignore whitespace
     <ClInclude Include="..\Classes\TextureCollection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\Exceptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="app.ico">