Index: trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp	(revision 112)
+++ trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp	(revision 113)
@@ -92,7 +92,6 @@
 {
 	// Set ambient light
-	//mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
 	mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
-
+	
 	//-- create light
 	mSunLight = mSceneMgr->createLight("SunLight");
@@ -104,5 +103,5 @@
 	mSunLight->setCastShadows(true);
 
-	Vector3 dir(0.5, 0.5, 0.5);
+	Vector3 dir(0.5, 1, 0.5);
 	dir.normalise();
 	mSunLight->setDirection(dir);
@@ -237,5 +236,5 @@
 mVizCamera(vizCamera),
 mShowVisualization(false),
-mRenderNodesForViz(false),
+mNodeVizMode(NODEVIZ_NONE),
 mVizCameraHeight(Real(2500.0)),
 mCamNode(camNode),
@@ -292,6 +291,5 @@
 	mSceneMgr->setOption("CullCamera", &mCullCamera);
 	mSceneMgr->setOption("ShowVisualization", &mShowVisualization);
-	mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
-
+	
 	pOver->show();
 } 
@@ -403,6 +401,6 @@
 		// important for visualization => draw octree bounding boxes
 		mSceneMgr->setOption("ShowOctree", &mShowVisualization);
-		// also render geometry?
-		mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
+		// also render nodew content?
+		//mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
 
 		// -- setup visualization camera
@@ -454,11 +452,11 @@
 	KEY_PRESSED(KC_C, 0.3, toggleUseVisibilityCulling());
 	KEY_PRESSED(KC_1, 0.3, toggleShowViz());
-	KEY_PRESSED(KC_2, 0.3, toggleRenderNodesForViz());
+	KEY_PRESSED(KC_2, 0.3, nextNodeVizMode());
 	
 	KEY_PRESSED(KC_SUBTRACT, 0, changeThreshold(-10));
 	KEY_PRESSED(KC_ADD, 0, changeThreshold(10));
 	
-	KEY_PRESSED(KC_3, 0, zoomVizCamera(50));
-	KEY_PRESSED(KC_4, 0, zoomVizCamera(-50));
+	KEY_PRESSED(KC_4, 0, zoomVizCamera(50));
+	KEY_PRESSED(KC_5, 0, zoomVizCamera(-50));
 
 	KEY_PRESSED(KC_F1, 0.3, nextAppState());
@@ -758,9 +756,15 @@
 }
 //-----------------------------------------------------------------------
-void MouseQueryListener::toggleRenderNodesForViz()
-{
-	mRenderNodesForViz = !mRenderNodesForViz;
-
-	mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
+void MouseQueryListener::nextNodeVizMode()
+{
+	mNodeVizMode = (mNodeVizMode + 1) % NODEVIZ_MODES_NUM;
+
+	bool renderNodesForViz = 
+		(mNodeVizMode == NODEVIZ_RENDER_NODES) || 
+		(mNodeVizMode == NODEVIZ_RENDER_NODES_AND_CONTENT);
+	bool renderNodesContentForViz = mNodeVizMode == NODEVIZ_RENDER_NODES_AND_CONTENT;
+
+	mSceneMgr->setOption("RenderNodesForViz", &renderNodesForViz);
+	mSceneMgr->setOption("RenderNodesContentForViz", &renderNodesContentForViz);
 }
 //-----------------------------------------------------------------------
@@ -848,4 +852,14 @@
 	const bool nShowViz = !showViz;
 
+	// ambient light must be full for visualization
+    if (showViz)
+	{
+		mSceneMgr->setAmbientLight(ColourValue(1, 1, 1));
+	}
+	else
+	{
+		mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
+	}
+
     mSceneMgr->setOption("ShowVisualization", &showViz);
 	mSceneMgr->setOption("SkyBoxEnabled", &nShowViz);
Index: trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h
===================================================================
--- trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h	(revision 112)
+++ trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h	(revision 113)
@@ -87,4 +87,8 @@
 	enum  {WALKTHROUGH, REPLAY, STATE_NUM};
 
+	// visualization modes for scene nodes
+	enum {NODEVIZ_NONE, NODEVIZ_RENDER_NODES, 
+		  NODEVIZ_RENDER_NODES_AND_CONTENT, NODEVIZ_MODES_NUM};
+
 	void nextAlgorithm();
 	void changeThreshold(int incr);
@@ -95,5 +99,5 @@
 	void toggleUseVisibilityCulling();
 	void toggleShowViz();
-	void toggleRenderNodesForViz();
+	void nextNodeVizMode();
 	void toggleRecord();
 
@@ -148,5 +152,5 @@
 	bool mUseVisibilityCulling;
 	bool mShowVisualization;
-	bool mRenderNodesForViz;
+	int mNodeVizMode;
 	bool mCullCamera;
 
