Basic scene graph system is in place.

Author: alfonse

Documents/Illumination/Tutorial 13.xml

@@ -166,8 +166,11 @@ void main()
                 we transform the camera-space position to clip-space as normal.</para>
             <para>The output <varname>mapping</varname> is a value that is used by the fragment
                 shader, as we will see below.</para>
-            <para>Since this vertex shader takes no inputs, our vertex array object does not need to
-                contain anything either. That is, we never call
+            <para><indexterm>
+                    <primary>Vertex Array Object</primary>
+                    <secondary>empty</secondary>
+                </indexterm>Since this vertex shader takes no inputs, our vertex array object does
+                not need to contain anything either. That is, we never call
                     <function>glEnableVertexAttribArray</function> on the VAO. Since no attribute
                 arrays are enabled, we also have no need for a buffer object to store vertex array
                 data. So we never call <function>glVertexAttribPointer</function>. We simply

Tut 13 Impostors/BasicImpostor.cpp

@@ -272,7 +272,6 @@ void CreateMaterials()
 }
 
 GLuint g_imposterVAO;
-GLuint g_imposterVBO;
 
 //Called after the window and OpenGL are initialized. Called exactly once, before the main loop.
 void init()
@@ -326,17 +325,8 @@ void init()
 
 	glBindBuffer(GL_UNIFORM_BUFFER, 0);
 
-	glGenBuffers(1, &g_imposterVBO);
-	glBindBuffer(GL_ARRAY_BUFFER, g_imposterVBO);
-	glBufferData(GL_ARRAY_BUFFER, 4 * sizeof(float), NULL, GL_STATIC_DRAW);
-
+	//Empty Vertex Array Object.
 	glGenVertexArrays(1, &g_imposterVAO);
-//	glBindVertexArray(g_imposterVAO);
-//	glEnableVertexAttribArray(0);
-//	glVertexAttribPointer(0, 1, GL_FLOAT, GL_FALSE, 0, (void*)(0));
-
-	glBindVertexArray(0);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 	CreateMaterials();
 }

Tut 17 Spotlight on Textures/Double Projection.cpp

@@ -18,6 +18,7 @@
 #include "../framework/Scene.h"
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/quaternion.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
 #define ARRAY_COUNT( array ) (sizeof( array ) / (sizeof( array[0] ) * (sizeof( array ) != sizeof(void*) || sizeof( array[0] ) <= sizeof(void*))))
@@ -172,7 +173,7 @@ void LoadTextures()
 //View setup.
 glutil::ViewData g_initialView =
 {
-	glm::vec3(-60.257084f, 10.947238f, 62.636356f),
+	glm::vec3(0.0f, 0.0f, 0.0f),
 	glm::fquat(-0.972817f, -0.099283f, -0.211198f, -0.020028f),
 	30.0f,
 	0.0f
@@ -196,21 +197,55 @@ namespace
 }
 
 Framework::Scene *g_pScene = NULL;
+std::vector<Framework::NodeRef> g_nodes;
+Framework::Timer g_timer(Framework::Timer::TT_LOOP, 10.0f);
 
-//Called after the window and OpenGL are initialized. Called exactly once, before the main loop.
-void init()
+class ColorUniformBinder : public Framework::StateBinder
 {
-	try
+public:
+	ColorUniformBinder()
+		: m_clrUnif(-1)
+		, m_clr(0.0f, 0.0f, 0.0f, 1.0f)	{}
+
+	void AssociateWithProgram(GLuint prog, const std::string &unifName)
 	{
-		g_pScene = new Framework::Scene("test.scene");
-//		InitializePrograms();
+		m_clrUnif = glGetUniformLocation(prog, unifName.c_str());
 	}
-	catch(std::exception &except)
+
+	void SetColor(const glm::vec4 &clr)	{ m_clr = clr; }
+
+	virtual void BindState() const
 	{
-		printf("%s\n", except.what());
-		throw;
+		glUniform4fv(m_clrUnif, 1, glm::value_ptr(m_clr));
 	}
 
+	virtual void UnbindState() const {}
+
+private:
+	GLint m_clrUnif;
+	glm::vec4 m_clr;
+};
+
+ColorUniformBinder g_clrUnif;
+
+void LoadAndSetupScene()
+{
+	g_nodes.clear();
+	g_pScene = new Framework::Scene("sceneTest.xml");
+	g_nodes.push_back(g_pScene->FindNode("blue"));
+	g_nodes.push_back(g_pScene->FindNode("user"));
+
+	GLuint colorProg = g_pScene->FindProgram("p_colored");
+
+	//No more things that can throw.
+	g_clrUnif.AssociateWithProgram(colorProg, "objectColor");
+	g_nodes[1].SetStateBinder(&g_clrUnif);
+	g_clrUnif.SetColor(glm::vec4(0.1f, 1.0f, 0.1f, 1.0f));
+}
+
+//Called after the window and OpenGL are initialized. Called exactly once, before the main loop.
+void init()
+{
 	glutMouseFunc(MouseButton);
 	glutMotionFunc(MouseMotion);
 	glutMouseWheelFunc(MouseWheel);
@@ -227,6 +262,7 @@ void init()
 	glDepthFunc(GL_LEQUAL);
 	glDepthRange(depthZNear, depthZFar);
 	glEnable(GL_DEPTH_CLAMP);
+	glEnable(GL_FRAMEBUFFER_SRGB);
 
 	//Setup our Uniform Buffers
 	glGenBuffers(1, &g_projectionUniformBuffer);
@@ -236,6 +272,17 @@ void init()
 	glBindBufferRange(GL_UNIFORM_BUFFER, g_projectionBlockIndex, g_projectionUniformBuffer,
 		0, sizeof(ProjectionBlock));
 
+	try
+	{
+		LoadAndSetupScene();
+//		InitializePrograms();
+	}
+	catch(std::exception &except)
+	{
+		printf("%s\n", except.what());
+		throw;
+	}
+
 /*
 	glGenBuffers(1, &g_lightUniformBuffer);
 	glBindBuffer(GL_UNIFORM_BUFFER, g_lightUniformBuffer);
@@ -265,9 +312,16 @@ void display()
 	if(!g_pScene)
 		return;
 
+	g_timer.Update();
+
 	glClearColor(0.8f, 0.8f, 0.8f, 1.0f);
 	glClearDepth(1.0f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	g_nodes[0].NodeSetOrient(glm::rotate(glm::fquat(),
+		360.0f * g_timer.GetAlpha(), glm::vec3(0.0f, 1.0f, 0.0f)));
+
+	g_pScene->Render(g_viewPole.CalcMatrix());
 /*
     if(!g_pLightEnv)
         return;
@@ -368,8 +422,9 @@ void display()
 		}
 	}
 
-	glutPostRedisplay();
-*/
+	*/
+
+    glutPostRedisplay();
 	glutSwapBuffers();
 }
 
@@ -406,6 +461,34 @@ void keyboard(unsigned char key, int x, int y)
 		glutLeaveMainLoop();
 		return;
 	case 32:
+		g_nodes[0].NodeSetTrans(glm::vec3(0.0f, 0.0f, 0.0f));
+		break;
+	case 'i':
+		g_nodes[0].NodeOffset(glm::vec3(0.0f, 1.0f, 0.0f));
+		break;
+	case 'j':
+		g_nodes[0].NodeOffset(glm::vec3(0.0f, -1.0f, 0.0f));
+		break;
+	case '\r':
+		{
+			std::auto_ptr<Framework::Scene> pOldScene(g_pScene);
+			g_pScene = NULL;
+			std::vector<Framework::NodeRef> tmpNodes;
+			tmpNodes.swap(g_nodes);
+			try
+			{
+				LoadAndSetupScene();
+			}
+			catch(std::exception &except)
+			{
+				printf("Failed to reload, due to: %s\n", except.what());
+				if(g_pScene)
+					delete g_pScene;
+				g_pScene = pOldScene.release();
+				g_nodes.swap(tmpNodes);
+				return;
+			}
+		}
 		break;
 	}
 

framework/Mesh.cpp

@@ -260,7 +260,6 @@ namespace Framework
 			}
 
 			strStream.flush();
-			const std::string &strTest = strStream.str();
 
 			//Parse the text stream.
 			pAttribType->ParseFunc(dataArray, strStream);