GRAPHICS: Add back support for NWN2 models

xoreos · Jan 29, 2014 · b03939e · b03939e
1 parent f48456e
commit b03939e
Show file tree

Hide file tree

Showing 6 changed files with 443 additions and 7 deletions.
diff --git a/src/graphics/aurora/Makefile.am b/src/graphics/aurora/Makefile.am
@@ -10,6 +10,7 @@ noinst_HEADERS = \
                  cube.h \
                  model.h \
                  model_nwn.h \
+                 model_nwn2.h \
                  model_kotor.h \
                  $(EMPTY)
 
@@ -20,5 +21,6 @@ libaurora_la_SOURCES = \
                        cube.cpp \
                        model.cpp \
                        model_nwn.cpp \
+                       model_nwn2.cpp \
                        model_kotor.cpp \
                        $(EMPTY)
diff --git a/src/graphics/aurora/meshutil.cpp b/src/graphics/aurora/meshutil.cpp
@@ -45,18 +45,18 @@ namespace Graphics {
 
 namespace Aurora {
 
-VertexDeclaration::VertexDeclaration() : faces(0), vertices(0), textures(0) {
+VertexDeclaration::VertexDeclaration() : textureUVW(false), faces(0), vertices(0), textures(0) {
 }
 
-VertexDeclaration::VertexDeclaration(uint16 f, uint16 v, uint16 t) :
-	faces(f), vertices(v), textures(t) {
+VertexDeclaration::VertexDeclaration(uint16 f, uint16 v, uint16 t, bool uvw) :
+	textureUVW(uvw), faces(f), vertices(v), textures(t) {
 
 	resize();
 }
 
 void VertexDeclaration::resize() {
 	bufferVerticesNormals.resize(vertices * 2 * 3);
-	bufferTexCoords.resize(vertices * textures * 2);
+	bufferTexCoords.resize(vertices * textures * (textureUVW ? 3 : 2));
 	bufferIndices.resize(faces * 3);
 }
 
@@ -90,7 +90,7 @@ void createMesh(Ogre::SubMesh *mesh, const VertexDeclaration &decl) {
 	}
 
 	assert (decl.bufferVerticesNormals.size() == (decl.vertices * 2 * 3));
-	assert (decl.bufferTexCoords.size() == (uint)(decl.vertices * decl.textures * 2));
+	assert (decl.bufferTexCoords.size() == (uint)(decl.vertices * decl.textures * (decl.textureUVW ? 3 : 2)));
 	assert (decl.bufferIndices.size() == (decl.faces * 3));
 
 	Ogre::VertexData *vertexData = new Ogre::VertexData();
@@ -108,7 +108,8 @@ void createMesh(Ogre::SubMesh *mesh, const VertexDeclaration &decl) {
 	vertexDecl->addElement(0, 1 * 3 * sizeof(float), Ogre::VET_FLOAT3, Ogre::VES_NORMAL);
 
 	for (uint i = 0; i < decl.textures; i++)
-		vertexDecl->addElement(1, i * 2 * sizeof(float), Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, i);
+		vertexDecl->addElement(1, i * (decl.textureUVW ? 3 : 2) * sizeof(float),
+				decl.textureUVW ? Ogre::VET_FLOAT3 : Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, i);
 
 	// Prepare hardware buffers
 

diff --git a/src/graphics/aurora/meshutil.h b/src/graphics/aurora/meshutil.h
@@ -53,6 +53,8 @@ Ogre::MeshManager &getOgreMeshManager();
 
 
 struct VertexDeclaration {
+	bool textureUVW;
+
 	uint16 faces;
 	uint16 vertices;
 	uint16 textures;
@@ -62,7 +64,7 @@ struct VertexDeclaration {
 	std::vector<uint16> bufferIndices;
 
 	VertexDeclaration();
-	VertexDeclaration(uint16 f, uint16 v, uint16 t);
+	VertexDeclaration(uint16 f, uint16 v, uint16 t, bool uvw = false);
 
 	void resize();
 	void getBounds(float &minX, float &minY, float &minZ,