Browse Source

Exporter updates

Panagiotis Christopoulos Charitos 10 years ago
parent
commit
99d08f481d

+ 1 - 1
include/anki/renderer/Drawer.h

@@ -33,7 +33,7 @@ class RenderableDrawer
 	friend class SetupRenderableVariableVisitor;
 
 public:
-	static const U32 MAX_UNIFORM_BUFFER_SIZE = 1024 * 1024 * 1;
+	static const U32 MAX_UNIFORM_BUFFER_SIZE = 1024 * 1024 * 2;
 
 	/// The one and only constructor
 	ANKI_USE_RESULT Error create(Renderer* r);

+ 1 - 1
shaders/IsLp.frag.glsl

@@ -10,7 +10,7 @@
 #define PI 3.1415926535
 
 #define ATTENUATION_FINE 0
-#define ATTENUATION_BOOST (0.05)
+#define ATTENUATION_BOOST (0.0)
 
 #ifndef BRDF
 #	define BRDF 1

+ 2 - 2
testapp/Main.cpp

@@ -59,7 +59,7 @@ Error init()
 	MainRenderer& renderer = app->getMainRenderer();
 	ResourceManager& resources = app->getResourceManager();
 
-	scene.setAmbientColor(Vec4(0.1, 0.05, 0.05, 0.0) * 0.3);
+	scene.setAmbientColor(Vec4(0.1, 0.05, 0.05, 0.0) * 0.8);
 
 	if(getenv("PROFILE"))
 	{
@@ -255,7 +255,7 @@ Error init()
 	{
 		ScriptResourcePointer script;
 
-		err = script.load("maps/adis/scene.lua", &resources);
+		err = script.load("maps/adis2/scene.lua", &resources);
 		if(err) return err;
 
 		err = app->getScriptManager().evalString(script->getSource());

+ 5 - 4
tools/scene/Exporter.cpp

@@ -1014,19 +1014,20 @@ void Exporter::exportAll()
 			model.m_instanced);
 
 		exportModel(model);
-		std::string name = getModelName(model);
+		std::string modelName = getModelName(model);
+		std::string nodeName = modelName + node.m_group;
 
 		// Write the main node
 		file << "\nnode = scene:newModelNode(\"" 
-			<< name << "\", \"" 
-			<< m_rpath << name << ".ankimdl" << "\")\n"; 
+			<< nodeName << "\", \"" 
+			<< m_rpath << modelName << ".ankimdl" << "\")\n"; 
 		writeNodeTransform("node", node.m_transforms[0]);
 
 		// Write instance nodes
 		for(unsigned j = 1; j < node.m_transforms.size(); j++)
 		{
 			file << "inst = scene:newInstanceNode(\"" 
-				<< name << "_inst" << (j - 1) << "\")\n"
+				<< nodeName << "_inst" << (j - 1) << "\")\n"
 				<< "node:getSceneNodeBase():addChild("
 				<< "inst:getSceneNodeBase())\n";
 

+ 1 - 1
tools/scene/ExporterMesh.cpp

@@ -259,7 +259,7 @@ void Exporter::exportMesh(
 		
 		if(face.mNumIndices != 3)
 		{
-			ERROR("For some reason the assimp returned wrong number of verts "
+			ERROR("For some reason assimp returned wrong number of verts "
 				"for a face (face.mNumIndices=%d). Probably degenerates in "
 				"input file", face.mNumIndices);
 		}