Commits

Suyang Dong committed dc249c6 Draft

It is still a mystory because the previous version still works on Toshiba.
However, it refuses to work if the GL_LIGHTING of the buildingModel is set
to OFF.
I have no other means but to enable the lighting and carefully set the lighting
position. Now everything works fine, so far...

  • Participants
  • Parent commits 274aa84

Comments (0)

Files changed (12)

File Aurora/Aurora.vcproj

 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SMARTHOMEINCLUDE)\CImg&quot;;&quot;$(openCVDir)\include\opencv&quot;;&quot;$(openCVDir)modules\core\include&quot;;&quot;$(openCVDir)moduels\calib3d\include&quot;"
+				AdditionalIncludeDirectories="../third_party/cv2cg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="osgdbd.lib osgGAd.lib osgViewerd.lib osgUtild.lib osgTextd.lib osgd.lib opencv_core231d.lib opencv_calib3d231d.lib"
+				AdditionalDependencies="osgdbd.lib osgGAd.lib osgViewerd.lib osgUtild.lib osgTextd.lib osgd.lib opencv_core240d.lib opencv_calib3d240d.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;$(SMARTHOMEINCLUDE)\CImg&quot;;&quot;$(openCVDir)\include\opencv&quot;;&quot;$(openCVDir)modules\core\include&quot;;&quot;$(openCVDir)moduels\calib3d\include&quot;"
+				AdditionalIncludeDirectories="../third_party/cv2cg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="osgdb.lib osgGA.lib osgViewer.lib osgUtil.lib osgText.lib osg.lib opencv_core231.lib opencv_calib3d231.lib"
+				AdditionalDependencies="osgdb.lib osgGA.lib osgViewer.lib osgUtil.lib osgText.lib osg.lib opencv_core240.lib opencv_calib3d240.lib"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

File Aurora/BuildingModel.cpp

 \*********************************************************************************************************/
 #include "BuildingModel.h"
 #include <osg/CullFace>
+#include <osg/Light>
+#include <osg/LightSource>
+#include <osg/StateAttribute>
 extern std::string getDataPath();
 
 // shake the model / cause damage
 
 	m_buildingAndCameraModel->addChild(createOrSetTripod(osg::Vec3d(WALL_LENGTH+15, -10.f, 0.f)));
 	m_buildingAndCameraModel->addChild(createOrSetCamera(osg::Vec3d(WALL_LENGTH+15, -10.f, 3.0f)));
-	m_buildingAndCameraModel->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-	m_buildingModelBeforeDamage->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-	m_buildingModelAfterDamage->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-	return m_buildingAndCameraModel.get();
+	osg::BoundingSphere bs(osg::Vec3(0.0f,0.0f,0.0f),1.0f);
+    bs = m_buildingAndCameraModel->getBound();    
+
+	// inflate the bounding sphere by 50%
+    float fRadius = bs.radius()*1.5f;
+	osg::Vec3 vCenter = bs.center();
+    // create statesets and the root of the light group
+    osg::StateSet* rootStateSet = new osg::StateSet;
+    m_buildingModel->setStateSet(rootStateSet);
+    osg::Group* lightGroup = new osg::Group;    
+    // define four lights
+	osg::Light* myLight1 = new osg::Light;    
+	// set the OpenGL light number
+	myLight1->setLightNum(1);    
+	// set the positions of the lights based on the bounding sphere size
+	myLight1->setPosition(osg::Vec4(vCenter.x(), vCenter.y(), vCenter.z()+(fRadius), 1));
+	// set the different intensities of the lights
+	myLight1->setAmbient(osg::Vec4(0.5f,0.5f,0.5f,1.0f));
+	myLight1->setDiffuse(osg::Vec4(1.0f,1.0f,1.0f,1.0f));	
+	myLight1->setSpecular(osg::Vec4(0.5f,0.5f,0.5f,0.5f));
+	// set the direction of the lights
+	myLight1->setDirection(osg::Vec3(-0.0f,-0.0f,-1.0f));
+	// define the light source objects to attach our lights to
+    osg::LightSource* lightS1 = new osg::LightSource;	    
+	// connect the lights with the light sources
+	lightS1->setLight(myLight1);    
+	lightS1->setLocalStateSetModes(osg::StateAttribute::ON);     
+	lightS1->setStateSetModes(*rootStateSet,osg::StateAttribute::ON);
+    
+	// add the light sources to the light root
+	lightGroup->addChild(lightS1);
+	// add the light root to the root of the scene
+    m_buildingAndCameraModel->addChild( lightGroup );
+	return m_buildingAndCameraModel;
+	//m_buildingAndCameraModel->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+	//m_buildingModelBeforeDamage->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+	//m_buildingModelAfterDamage->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
 }
 
+//dcvUserScene::AddLightsToScene()
+//{
+//    // default scale for this model.
+//    osg::BoundingSphere bs(osg::Vec3(0.0f,0.0f,0.0f),1.0f);
+//
+//    if (m_pUserSceneRoot.get() != NULL)
+//    {
+//        bs = m_pUserSceneRoot->getBound();
+//    }
+//    
+//	// inflate the bounding sphere by 50%
+//    float fRadius = bs.radius()*1.5f;
+//	osg::Vec3 vCenter = bs.center();
+//
+//    // create statesets and the root of the light group
+//    osg::StateSet* rootStateSet = new osg::StateSet;
+//    m_pUserSceneRoot->setStateSet(rootStateSet);
+//    osg::Group* lightGroup = new osg::Group;
+//    
+//    // define four lights
+//	osg::Light* myLight1 = new osg::Light;
+//    
+//	// set the OpenGL light number
+//	myLight1->setLightNum(1);
+//    
+//	// set the positions of the lights based on the bounding sphere size
+//	myLight1->setPosition(osg::Vec4(vCenter.x(), vCenter.y()+(0.5*fRadius), vCenter.z(), 1));
+//
+//
+//	// default intensities in osg::light.cpp
+//	//_ambient.set(0.05f,0.05f,0.05f,1.0f);
+//    //_diffuse.set(0.8f,0.8f,0.8f,1.0f);
+//    //_specular.set(0.05f,0.05f,0.05f,1.0f);
+//
+//	// set the different intensities of the lights
+//	myLight1->setAmbient(osg::Vec4(0.5f,0.5f,0.5f,1.0f));
+//
+//	myLight1->setDiffuse(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
+//	
+//	myLight1->setSpecular(osg::Vec4(0.5f,0.5f,0.5f,0.5f));
+//
+//	// set the direction of the lights
+//	myLight1->setDirection(osg::Vec3(-1.0f,-1.0f,0.0f));
+//
+//	// define the light source objects to attach our lights to
+//    osg::LightSource* lightS1 = new osg::LightSource;	
+//    
+//	// connect the lights with the light sources
+//	lightS1->setLight(myLight1);
+//    
+//	lightS1->setLocalStateSetModes(osg::StateAttribute::ON); 
+//    
+//	lightS1->setStateSetModes(*rootStateSet,osg::StateAttribute::ON);
+//    
+//	// add the light sources to the light root
+//	lightGroup->addChild(lightS1);
+//	// add the light root to the root of the scene
+//    m_pUserSceneRoot->addChild( lightGroup );
+//}
+//
 
 osg::Group* CBuildingModel::createStory(int storyIndex, bool damage)
 {

File Aurora/ViewOrganizer.cpp

Binary file modified.

File data/model/VertAfterDamage.txt

 0	SE:	45.70000		0.00000		0.00000
 0	NE:	45.70000		30.50000		0.00000
 0	NW:	0.00000		30.50000		0.00000
-1	SW:	0.03064		-0.02845		5.33000
-1	SE:	45.73064		0.01463		5.33000
-1	NE:	45.67151		30.51463		5.33000
-1	NW:	-0.02849		30.47155		5.33000
-2	SW:	-0.01707		-0.03825		9.53000
-2	SE:	45.68293		0.01997		9.53000
-2	NE:	45.68506		30.51997		9.53000
-2	NW:	-0.01494		30.46175		9.53000
-3	SW:	-0.00685		0.02332		13.73000
-3	SE:	45.69315		0.00418		13.73000
-3	NE:	45.67588		30.50418		13.73000
-3	NW:	-0.02412		30.52332		13.73000
-4	SW:	0.00490		0.01864		17.93000
-4	SE:	45.70490		0.01397		17.93000
-4	NE:	45.68947		30.51397		17.93000
-4	NW:	-0.01053		30.51864		17.93000
-5	SW:	0.01408		0.02202		22.13000
-5	SE:	45.71408		-0.00826		22.13000
-5	NE:	45.73667		30.49174		22.13000
-5	NW:	0.03667		30.52202		22.13000
-6	SW:	-0.03969		-0.03882		26.33000
-6	SE:	45.66031		-0.02819		26.33000
-6	NE:	45.66816		30.47181		26.33000
-6	NW:	-0.03184		30.46118		26.33000
-7	SW:	0.03967		0.03713		30.53000
-7	SE:	45.73967		-0.03738		30.53000
-7	NE:	45.72231		30.46262		30.53000
-7	NW:	0.02231		30.53713		30.53000
-8	SW:	-0.00812		-0.02378		34.73000
-8	SE:	45.69188		0.01820		34.73000
-8	NE:	45.67252		30.51820		34.73000
-8	NW:	-0.02748		30.47622		34.73000
-9	SW:	-0.02219		0.01584		38.93000
-9	SE:	45.67781		0.01055		38.93000
-9	NE:	45.73589		30.51055		38.93000
-9	NW:	0.03589		30.51584		38.93000
-10	SW:	-0.03305		-0.01419		43.13000
-10	SE:	45.66695		-0.02692		43.13000
-10	NE:	45.72365		30.47308		43.13000
-10	NW:	0.02365		30.48581		43.13000
+1	SW:	-0.03417		0.01434		5.33000
+1	SE:	45.66583		0.01173		5.33000
+1	NE:	45.72475		30.51173		5.33000
+1	NW:	0.02475		30.51434		5.33000
+2	SW:	-0.01481		0.00601		9.53000
+2	SE:	45.68519		0.00803		9.53000
+2	NE:	45.66935		30.50803		9.53000
+2	NW:	-0.03065		30.50601		9.53000
+3	SW:	-0.03996		-0.01592		13.73000
+3	SE:	45.66004		0.02274		13.73000
+3	NE:	45.68894		30.52274		13.73000
+3	NW:	-0.01106		30.48408		13.73000
+4	SW:	-0.00404		0.01748		17.93000
+4	SE:	45.69596		-0.02109		17.93000
+4	NE:	45.69559		30.47891		17.93000
+4	NW:	-0.00441		30.51748		17.93000
+5	SW:	0.00442		0.01677		22.13000
+5	SE:	45.70442		0.03862		22.13000
+5	NE:	45.70929		30.53862		22.13000
+5	NW:	0.00929		30.51677		22.13000
+6	SW:	-0.02558		0.02225		26.33000
+6	SE:	45.67442		0.01344		26.33000
+6	NE:	45.69411		30.51344		26.33000
+6	NW:	-0.00589		30.52225		26.33000
+7	SW:	-0.00144		-0.00689		30.53000
+7	SE:	45.69856		-0.02656		30.53000
+7	NE:	45.68069		30.47344		30.53000
+7	NW:	-0.01931		30.49311		30.53000
+8	SW:	-0.03885		0.02932		34.73000
+8	SE:	45.66115		-0.03386		34.73000
+8	NE:	45.66677		30.46614		34.73000
+8	NW:	-0.03323		30.52932		34.73000
+9	SW:	-0.01829		-0.02311		38.93000
+9	SE:	45.68171		0.00775		38.93000
+9	NE:	45.70006		30.50775		38.93000
+9	NW:	0.00006		30.47689		38.93000
+10	SW:	0.02042		0.02510		43.13000
+10	SE:	45.72042		-0.03901		43.13000
+10	NE:	45.71784		30.46099		43.13000
+10	NW:	0.01784		30.52510		43.13000

File data/model/afterDamageModel.osg

       textureUnit 0 {
         GL_TEXTURE_2D ON
         Texture2D {
-          file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\terrain.jpg"
+          file ".\\..\\data\\texture\\terrain.jpg"
           wrap_s CLAMP
           wrap_t CLAMP
           wrap_r CLAMP
           unRefImageDataAfterApply FALSE
           internalFormatMode USE_IMAGE_DATA_FORMAT
           resizeNonPowerOfTwo TRUE
+          shadowComparison FALSE
+          shadowCompareFunc GL_LEQUAL
+          shadowTextureMode GL_LUMINANCE
         }
       }
     }
       textureUnit 0 {
         GL_TEXTURE_2D ON
         Texture2D {
-          file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\roof.jpg"
+          file ".\\..\\data\\texture\\roof.jpg"
           wrap_s CLAMP
           wrap_t CLAMP
           wrap_r CLAMP
           unRefImageDataAfterApply FALSE
           internalFormatMode USE_IMAGE_DATA_FORMAT
           resizeNonPowerOfTwo TRUE
+          shadowComparison FALSE
+          shadowCompareFunc GL_LEQUAL
+          shadowTextureMode GL_LUMINANCE
         }
       }
     }
       }
       VertexArray Vec3dArray 4
       {
-        -0.0330467261373997 -0.0141878174617887 43.1300048828125
-        45.6669532738626 -0.0269181989133358 43.1300048828125
-        45.7236456878483 30.4730818010867 43.1300048828125
-        0.0236456878483295 30.4858121825382 43.1300048828125
+        0.0204211249947548 0.025099677965045 43.1300048828125
+        45.7204211249948 -0.0390060618519783 43.1300048828125
+        45.7178426243365 30.460993938148 43.1300048828125
+        0.0178426243364811 30.525099677965 43.1300048828125
       }
       TexCoordArray 0 Vec2dArray 4
       {
           GL_TEXTURE_2D ON
           Texture2D {
             UniqueID Texture2D_3
-            file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\NorthSouth.jpg"
+            file ".\\..\\data\\texture\\NorthSouth.jpg"
             wrap_s CLAMP
             wrap_t CLAMP
             wrap_r CLAMP
             unRefImageDataAfterApply FALSE
             internalFormatMode USE_IMAGE_DATA_FORMAT
             resizeNonPowerOfTwo TRUE
+            shadowComparison FALSE
+            shadowCompareFunc GL_LEQUAL
+            shadowTextureMode GL_LUMINANCE
           }
         }
       }
         {
           45.7 0 0
           0 0 0
-          0.0306426789611578 -0.0284510646015406 5.32999992370605
-          45.7306426789612 0.014625545591116 5.32999992370605
+          -0.034170001745224 0.0143407620489597 5.32999992370605
+          45.6658299982548 0.0117340590804815 5.32999992370605
         }
         TexCoordArray 0 Vec2dArray 4
         {
         {
           0 30.5 0
           45.7 30.5 0
-          45.6715127404779 30.5146255455911 5.32999992370605
-          -0.0284872595220804 30.4715489353985 5.32999992370605
+          45.7247475299984 30.5117340590805 5.32999992370605
+          0.0247475299984217 30.514340762049 5.32999992370605
         }
         TexCoordArray 0 Vec2dArray 4
         {
           GL_TEXTURE_2D ON
           Texture2D {
             UniqueID Texture2D_4
-            file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\EastWest.jpg"
+            file ".\\..\\data\\texture\\EastWest.jpg"
             wrap_s CLAMP
             wrap_t CLAMP
             wrap_r CLAMP
             unRefImageDataAfterApply FALSE
             internalFormatMode USE_IMAGE_DATA_FORMAT
             resizeNonPowerOfTwo TRUE
+            shadowComparison FALSE
+            shadowCompareFunc GL_LEQUAL
+            shadowTextureMode GL_LUMINANCE
           }
         }
       }
         {
           0 0 0
           0 30.5 0
-          -0.0284872595220804 30.4715489353985 5.32999992370605
-          0.0306426789611578 -0.0284510646015406 5.32999992370605
+          0.0247475299984217 30.514340762049 5.32999992370605
+          -0.034170001745224 0.0143407620489597 5.32999992370605
         }
         TexCoordArray 0 Vec2dArray 4
         {
         {
           45.7 0 0
           45.7 30.5 0
-          45.6715127404779 30.5146255455911 5.32999992370605
-          45.7306426789612 0.014625545591116 5.32999992370605
+          45.7247475299984 30.5117340590805 5.32999992370605
+          45.6658299982548 0.0117340590804815 5.32999992370605
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7306426789612 0.014625545591116 5.32999992370605
-          0.0306426789611578 -0.0284510646015406 5.32999992370605
-          -0.0170652065426111 -0.0382511354982853 9.52999973297119
-          45.6829347934574 0.0199655946344137 9.52999973297119
+          45.6658299982548 0.0117340590804815 5.32999992370605
+          -0.034170001745224 0.0143407620489597 5.32999992370605
+          -0.0148099390789866 0.00600940268486738 9.52999973297119
+          45.685190060921 0.00802558474242687 9.52999973297119
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0284872595220804 30.4715489353985 5.32999992370605
-          45.6715127404779 30.5146255455911 5.32999992370605
-          45.6850550349802 30.5199655946344 9.52999973297119
-          -0.0149449650198221 30.4617488645017 9.52999973297119
+          0.0247475299984217 30.514340762049 5.32999992370605
+          45.7247475299984 30.5117340590805 5.32999992370605
+          45.6693465847522 30.5080255847424 9.52999973297119
+          -0.030653415247798 30.5060094026849 9.52999973297119
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0306426789611578 -0.0284510646015406 5.32999992370605
-          -0.0284872595220804 30.4715489353985 5.32999992370605
-          -0.0149449650198221 30.4617488645017 9.52999973297119
-          -0.0170652065426111 -0.0382511354982853 9.52999973297119
+          -0.034170001745224 0.0143407620489597 5.32999992370605
+          0.0247475299984217 30.514340762049 5.32999992370605
+          -0.030653415247798 30.5060094026849 9.52999973297119
+          -0.0148099390789866 0.00600940268486738 9.52999973297119
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7306426789612 0.014625545591116 5.32999992370605
-          45.6715127404779 30.5146255455911 5.32999992370605
-          45.6850550349802 30.5199655946344 9.52999973297119
-          45.6829347934574 0.0199655946344137 9.52999973297119
+          45.6658299982548 0.0117340590804815 5.32999992370605
+          45.7247475299984 30.5117340590805 5.32999992370605
+          45.6693465847522 30.5080255847424 9.52999973297119
+          45.685190060921 0.00802558474242687 9.52999973297119
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6829347934574 0.0199655946344137 9.52999973297119
-          -0.0170652065426111 -0.0382511354982853 9.52999973297119
-          -0.00684620207175612 0.0233191456645727 13.7299995422363
-          45.6931537979282 0.00417583854869008 13.7299995422363
+          45.685190060921 0.00802558474242687 9.52999973297119
+          -0.0148099390789866 0.00600940268486738 9.52999973297119
+          -0.039964959025383 -0.0159174166619778 13.7299995422363
+          45.6600350409746 0.0227419566363096 13.7299995422363
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0149449650198221 30.4617488645017 9.52999973297119
-          45.6850550349802 30.5199655946344 9.52999973297119
-          45.6758817274123 30.5041758385487 13.7299995422363
-          -0.024118272587657 30.5233191456646 13.7299995422363
+          -0.030653415247798 30.5060094026849 9.52999973297119
+          45.6693465847522 30.5080255847424 9.52999973297119
+          45.6889392955229 30.5227419566363 13.7299995422363
+          -0.0110607044771314 30.484082583338 13.7299995422363
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0170652065426111 -0.0382511354982853 9.52999973297119
-          -0.0149449650198221 30.4617488645017 9.52999973297119
-          -0.024118272587657 30.5233191456646 13.7299995422363
-          -0.00684620207175612 0.0233191456645727 13.7299995422363
+          -0.0148099390789866 0.00600940268486738 9.52999973297119
+          -0.030653415247798 30.5060094026849 9.52999973297119
+          -0.0110607044771314 30.484082583338 13.7299995422363
+          -0.039964959025383 -0.0159174166619778 13.7299995422363
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6829347934574 0.0199655946344137 9.52999973297119
-          45.6850550349802 30.5199655946344 9.52999973297119
-          45.6758817274123 30.5041758385487 13.7299995422363
-          45.6931537979282 0.00417583854869008 13.7299995422363
+          45.685190060921 0.00802558474242687 9.52999973297119
+          45.6693465847522 30.5080255847424 9.52999973297119
+          45.6889392955229 30.5227419566363 13.7299995422363
+          45.6600350409746 0.0227419566363096 13.7299995422363
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6931537979282 0.00417583854869008 13.7299995422363
-          -0.00684620207175612 0.0233191456645727 13.7299995422363
-          0.00489733275026083 0.0186406895518303 17.9300003051758
-          45.7048973327503 0.0139714786782861 17.9300003051758
+          45.6600350409746 0.0227419566363096 13.7299995422363
+          -0.039964959025383 -0.0159174166619778 13.7299995422363
+          -0.00403667613863945 0.0174786932766438 17.9300003051758
+          45.6959633238614 -0.0210949312895536 17.9300003051758
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.024118272587657 30.5233191456646 13.7299995422363
-          45.6758817274123 30.5041758385487 13.7299995422363
-          45.6894718853757 30.5139714786783 17.9300003051758
-          -0.0105281146243215 30.5186406895518 17.9300003051758
+          -0.0110607044771314 30.484082583338 13.7299995422363
+          45.6889392955229 30.5227419566363 13.7299995422363
+          45.6955862979405 30.4789050687104 17.9300003051758
+          -0.00441370205953717 30.5174786932766 17.9300003051758
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.00684620207175612 0.0233191456645727 13.7299995422363
-          -0.024118272587657 30.5233191456646 13.7299995422363
-          -0.0105281146243215 30.5186406895518 17.9300003051758
-          0.00489733275026083 0.0186406895518303 17.9300003051758
+          -0.039964959025383 -0.0159174166619778 13.7299995422363
+          -0.0110607044771314 30.484082583338 13.7299995422363
+          -0.00441370205953717 30.5174786932766 17.9300003051758
+          -0.00403667613863945 0.0174786932766438 17.9300003051758
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6931537979282 0.00417583854869008 13.7299995422363
-          45.6758817274123 30.5041758385487 13.7299995422363
-          45.6894718853757 30.5139714786783 17.9300003051758
-          45.7048973327503 0.0139714786782861 17.9300003051758
+          45.6600350409746 0.0227419566363096 13.7299995422363
+          45.6889392955229 30.5227419566363 13.7299995422363
+          45.6955862979405 30.4789050687104 17.9300003051758
+          45.6959633238614 -0.0210949312895536 17.9300003051758
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7048973327503 0.0139714786782861 17.9300003051758
-          0.00489733275026083 0.0186406895518303 17.9300003051758
-          0.0140772694721818 0.0220217946916819 22.1300010681152
-          45.7140772694722 -0.008261913433671 22.1300010681152
+          45.6959633238614 -0.0210949312895536 17.9300003051758
+          -0.00403667613863945 0.0174786932766438 17.9300003051758
+          0.00441775983199477 0.0167724415659904 22.1300010681152
+          45.704417759832 0.0386230014264584 22.1300010681152
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0105281146243215 30.5186406895518 17.9300003051758
-          45.6894718853757 30.5139714786783 17.9300003051758
-          45.7366747006774 30.4917380865663 22.1300010681152
-          0.0366747006773949 30.5220217946917 22.1300010681152
+          -0.00441370205953717 30.5174786932766 17.9300003051758
+          45.6955862979405 30.4789050687104 17.9300003051758
+          45.7092889042571 30.5386230014265 22.1300010681152
+          0.0092889042571187 30.516772441566 22.1300010681152
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.00489733275026083 0.0186406895518303 17.9300003051758
-          -0.0105281146243215 30.5186406895518 17.9300003051758
-          0.0366747006773949 30.5220217946917 22.1300010681152
-          0.0140772694721818 0.0220217946916819 22.1300010681152
+          -0.00403667613863945 0.0174786932766438 17.9300003051758
+          -0.00441370205953717 30.5174786932766 17.9300003051758
+          0.0092889042571187 30.516772441566 22.1300010681152
+          0.00441775983199477 0.0167724415659904 22.1300010681152
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7048973327503 0.0139714786782861 17.9300003051758
-          45.6894718853757 30.5139714786783 17.9300003051758
-          45.7366747006774 30.4917380865663 22.1300010681152
-          45.7140772694722 -0.008261913433671 22.1300010681152
+          45.6959633238614 -0.0210949312895536 17.9300003051758
+          45.6955862979405 30.4789050687104 17.9300003051758
+          45.7092889042571 30.5386230014265 22.1300010681152
+          45.704417759832 0.0386230014264584 22.1300010681152
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7140772694722 -0.008261913433671 22.1300010681152
-          0.0140772694721818 0.0220217946916819 22.1300010681152
-          -0.0396948792040348 -0.0388195589184761 26.3300018310547
-          45.660305120796 -0.0281905643641949 26.3300018310547
+          45.704417759832 0.0386230014264584 22.1300010681152
+          0.00441775983199477 0.0167724415659904 22.1300010681152
+          -0.0255754068493843 0.0222525466233492 26.3300018310547
+          45.6744245931506 0.0134433414787054 26.3300018310547
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0366747006773949 30.5220217946917 22.1300010681152
-          45.7366747006774 30.4917380865663 22.1300010681152
-          45.6681639671326 30.4718094356358 26.3300018310547
-          -0.0318360328674316 30.4611804410815 26.3300018310547
+          0.0092889042571187 30.516772441566 22.1300010681152
+          45.7092889042571 30.5386230014265 22.1300010681152
+          45.694112777058 30.5134433414787 26.3300018310547
+          -0.00588722294196486 30.5222525466233 26.3300018310547
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0140772694721818 0.0220217946916819 22.1300010681152
-          0.0366747006773949 30.5220217946917 22.1300010681152
-          -0.0318360328674316 30.4611804410815 26.3300018310547
-          -0.0396948792040348 -0.0388195589184761 26.3300018310547
+          0.00441775983199477 0.0167724415659904 22.1300010681152
+          0.0092889042571187 30.516772441566 22.1300010681152
+          -0.00588722294196486 30.5222525466233 26.3300018310547
+          -0.0255754068493843 0.0222525466233492 26.3300018310547
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7140772694722 -0.008261913433671 22.1300010681152
-          45.7366747006774 30.4917380865663 22.1300010681152
-          45.6681639671326 30.4718094356358 26.3300018310547
-          45.660305120796 -0.0281905643641949 26.3300018310547
+          45.704417759832 0.0386230014264584 22.1300010681152
+          45.7092889042571 30.5386230014265 22.1300010681152
+          45.694112777058 30.5134433414787 26.3300018310547
+          45.6744245931506 0.0134433414787054 26.3300018310547
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.660305120796 -0.0281905643641949 26.3300018310547
-          -0.0396948792040348 -0.0388195589184761 26.3300018310547
-          0.0396657511591911 0.0371269024908543 30.5300025939941
-          45.7396657511592 -0.0373822115361691 30.5300025939941
+          45.6744245931506 0.0134433414787054 26.3300018310547
+          -0.0255754068493843 0.0222525466233492 26.3300018310547
+          -0.00144340528640896 -0.00689467741176486 30.5300025939941
+          45.6985565947136 -0.0265607722103596 30.5300025939941
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0318360328674316 30.4611804410815 26.3300018310547
-          45.6681639671326 30.4718094356358 26.3300018310547
-          45.7223122872412 30.4626177884638 30.5300025939941
-          0.0223122872412205 30.5371269024909 30.5300025939941
+          -0.00588722294196486 30.5222525466233 26.3300018310547
+          45.694112777058 30.5134433414787 26.3300018310547
+          45.6806874189526 30.4734392277896 30.5300025939941
+          -0.0193125810474157 30.4931053225882 30.5300025939941
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0396948792040348 -0.0388195589184761 26.3300018310547
-          -0.0318360328674316 30.4611804410815 26.3300018310547
-          0.0223122872412205 30.5371269024909 30.5300025939941
-          0.0396657511591911 0.0371269024908543 30.5300025939941
+          -0.0255754068493843 0.0222525466233492 26.3300018310547
+          -0.00588722294196486 30.5222525466233 26.3300018310547
+          -0.0193125810474157 30.4931053225882 30.5300025939941
+          -0.00144340528640896 -0.00689467741176486 30.5300025939941
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.660305120796 -0.0281905643641949 26.3300018310547
-          45.6681639671326 30.4718094356358 26.3300018310547
-          45.7223122872412 30.4626177884638 30.5300025939941
-          45.7396657511592 -0.0373822115361691 30.5300025939941
+          45.6744245931506 0.0134433414787054 26.3300018310547
+          45.694112777058 30.5134433414787 26.3300018310547
+          45.6806874189526 30.4734392277896 30.5300025939941
+          45.6985565947136 -0.0265607722103596 30.5300025939941
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7396657511592 -0.0373822115361691 30.5300025939941
-          0.0396657511591911 0.0371269024908543 30.5300025939941
-          -0.00811730045825243 -0.0237818881869316 34.7300033569336
-          45.6918826995418 0.0181957650929689 34.7300033569336
+          45.6985565947136 -0.0265607722103596 30.5300025939941
+          -0.00144340528640896 -0.00689467741176486 30.5300025939941
+          -0.0388476960361004 0.0293200276792049 34.7300033569336
+          45.6611523039639 -0.0338603369891644 34.7300033569336
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0223122872412205 30.5371269024909 30.5300025939941
-          45.7223122872412 30.4626177884638 30.5300025939941
-          45.6725220557302 30.518195765093 34.7300033569336
-          -0.0274779442697763 30.4762181118131 34.7300033569336
+          -0.0193125810474157 30.4931053225882 30.5300025939941
+          45.6806874189526 30.4734392277896 30.5300025939941
+          45.6667689725757 30.4661396630108 34.7300033569336
+          -0.0332310274243355 30.5293200276792 34.7300033569336
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0396657511591911 0.0371269024908543 30.5300025939941
-          0.0223122872412205 30.5371269024909 30.5300025939941
-          -0.0274779442697763 30.4762181118131 34.7300033569336
-          -0.00811730045825243 -0.0237818881869316 34.7300033569336
+          -0.00144340528640896 -0.00689467741176486 30.5300025939941
+          -0.0193125810474157 30.4931053225882 30.5300025939941
+          -0.0332310274243355 30.5293200276792 34.7300033569336
+          -0.0388476960361004 0.0293200276792049 34.7300033569336
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.7396657511592 -0.0373822115361691 30.5300025939941
-          45.7223122872412 30.4626177884638 30.5300025939941
-          45.6725220557302 30.518195765093 34.7300033569336
-          45.6918826995418 0.0181957650929689 34.7300033569336
+          45.6985565947136 -0.0265607722103596 30.5300025939941
+          45.6806874189526 30.4734392277896 30.5300025939941
+          45.6667689725757 30.4661396630108 34.7300033569336
+          45.6611523039639 -0.0338603369891644 34.7300033569336
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6918826995418 0.0181957650929689 34.7300033569336
-          -0.00811730045825243 -0.0237818881869316 34.7300033569336
-          -0.0221933778375387 0.0158390514552593 38.930004119873
-          45.6778066221625 0.010548927821219 38.930004119873
+          45.6611523039639 -0.0338603369891644 34.7300033569336
+          -0.0388476960361004 0.0293200276792049 34.7300033569336
+          -0.0182923749089241 -0.0231129638850689 38.930004119873
+          45.6817076250911 0.00774777680635452 38.930004119873
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0274779442697763 30.4762181118131 34.7300033569336
-          45.6725220557302 30.518195765093 34.7300033569336
-          45.7358856730163 30.5105489278212 38.930004119873
-          0.0358856730163097 30.5158390514553 38.930004119873
+          -0.0332310274243355 30.5293200276792 34.7300033569336
+          45.6667689725757 30.4661396630108 34.7300033569336
+          45.7000575799859 30.5077477768064 38.930004119873
+          5.75799858779646e-005 30.4768870361149 38.930004119873
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.00811730045825243 -0.0237818881869316 34.7300033569336
-          -0.0274779442697763 30.4762181118131 34.7300033569336
-          0.0358856730163097 30.5158390514553 38.930004119873
-          -0.0221933778375387 0.0158390514552593 38.930004119873
+          -0.0388476960361004 0.0293200276792049 34.7300033569336
+          -0.0332310274243355 30.5293200276792 34.7300033569336
+          5.75799858779646e-005 30.4768870361149 38.930004119873
+          -0.0182923749089241 -0.0231129638850689 38.930004119873
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6918826995418 0.0181957650929689 34.7300033569336
-          45.6725220557302 30.518195765093 34.7300033569336
-          45.7358856730163 30.5105489278212 38.930004119873
-          45.6778066221625 0.010548927821219 38.930004119873
+          45.6611523039639 -0.0338603369891644 34.7300033569336
+          45.6667689725757 30.4661396630108 34.7300033569336
+          45.7000575799859 30.5077477768064 38.930004119873
+          45.6817076250911 0.00774777680635452 38.930004119873
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6778066221625 0.010548927821219 38.930004119873
-          -0.0221933778375387 0.0158390514552593 38.930004119873
-          -0.0330467261373997 -0.0141878174617887 43.1300048828125
-          45.6669532738626 -0.0269181989133358 43.1300048828125
+          45.6817076250911 0.00774777680635452 38.930004119873
+          -0.0182923749089241 -0.0231129638850689 38.930004119873
+          0.0204211249947548 0.025099677965045 43.1300048828125
+          45.7204211249948 -0.0390060618519783 43.1300048828125
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          0.0358856730163097 30.5158390514553 38.930004119873
-          45.7358856730163 30.5105489278212 38.930004119873
-          45.7236456878483 30.4730818010867 43.1300048828125
-          0.0236456878483295 30.4858121825382 43.1300048828125
+          5.75799858779646e-005 30.4768870361149 38.930004119873
+          45.7000575799859 30.5077477768064 38.930004119873
+          45.7178426243365 30.460993938148 43.1300048828125
+          0.0178426243364811 30.525099677965 43.1300048828125
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          -0.0221933778375387 0.0158390514552593 38.930004119873
-          0.0358856730163097 30.5158390514553 38.930004119873
-          0.0236456878483295 30.4858121825382 43.1300048828125
-          -0.0330467261373997 -0.0141878174617887 43.1300048828125
+          -0.0182923749089241 -0.0231129638850689 38.930004119873
+          5.75799858779646e-005 30.4768870361149 38.930004119873
+          0.0178426243364811 30.525099677965 43.1300048828125
+          0.0204211249947548 0.025099677965045 43.1300048828125
         }
         TexCoordArray 0 Vec2dArray 4
         {
         }
         VertexArray Vec3dArray 4
         {
-          45.6778066221625 0.010548927821219 38.930004119873
-          45.7358856730163 30.5105489278212 38.930004119873
-          45.7236456878483 30.4730818010867 43.1300048828125
-          45.6669532738626 -0.0269181989133358 43.1300048828125
+          45.6817076250911 0.00774777680635452 38.930004119873
+          45.7000575799859 30.5077477768064 38.930004119873
+          45.7178426243365 30.460993938148 43.1300048828125
+          45.7204211249948 -0.0390060618519783 43.1300048828125
         }
         TexCoordArray 0 Vec2dArray 4
         {

File data/model/beforeDamageModel.osg

       textureUnit 0 {
         GL_TEXTURE_2D ON
         Texture2D {
-          file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\terrain.jpg"
+          file ".\\..\\data\\texture\\terrain.jpg"
           wrap_s CLAMP
           wrap_t CLAMP
           wrap_r CLAMP
           unRefImageDataAfterApply FALSE
           internalFormatMode USE_IMAGE_DATA_FORMAT
           resizeNonPowerOfTwo TRUE
+          shadowComparison FALSE
+          shadowCompareFunc GL_LEQUAL
+          shadowTextureMode GL_LUMINANCE
         }
       }
     }
       textureUnit 0 {
         GL_TEXTURE_2D ON
         Texture2D {
-          file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\roof.jpg"
+          file ".\\..\\data\\texture\\roof.jpg"
           wrap_s CLAMP
           wrap_t CLAMP
           wrap_r CLAMP
           unRefImageDataAfterApply FALSE
           internalFormatMode USE_IMAGE_DATA_FORMAT
           resizeNonPowerOfTwo TRUE
+          shadowComparison FALSE
+          shadowCompareFunc GL_LEQUAL
+          shadowTextureMode GL_LUMINANCE
         }
       }
     }
           GL_TEXTURE_2D ON
           Texture2D {
             UniqueID Texture2D_3
-            file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\NorthSouth.jpg"
+            file ".\\..\\data\\texture\\NorthSouth.jpg"
             wrap_s CLAMP
             wrap_t CLAMP
             wrap_r CLAMP
             unRefImageDataAfterApply FALSE
             internalFormatMode USE_IMAGE_DATA_FORMAT
             resizeNonPowerOfTwo TRUE
+            shadowComparison FALSE
+            shadowCompareFunc GL_LEQUAL
+            shadowTextureMode GL_LUMINANCE
           }
         }
       }
           GL_TEXTURE_2D ON
           Texture2D {
             UniqueID Texture2D_4
-            file "C:\\Documents and Settings\\dsuyang\\My Documents\\Visual Studio 2008\\Projects\\ARQuake\\data\\texture\\EastWest.jpg"
+            file ".\\..\\data\\texture\\EastWest.jpg"
             wrap_s CLAMP
             wrap_t CLAMP
             wrap_r CLAMP
             unRefImageDataAfterApply FALSE
             internalFormatMode USE_IMAGE_DATA_FORMAT
             resizeNonPowerOfTwo TRUE
+            shadowComparison FALSE
+            shadowCompareFunc GL_LEQUAL
+            shadowTextureMode GL_LUMINANCE
           }
         }
       }

File data/observation/Detected 2D image corner.txt

 Detected Corner of 2D Image Coordinate
 
 Observation Point: 0	Story Index: 	0
-X: 0	Y: 0
+X: 320.625	Y: 365.618
 
 Observation Point: 0	Story Index: 	1
-X: 0	Y: 0
+X: 331.828	Y: 370.78
 
 Observation Point: 0	Story Index: 	2
 X: 0	Y: 0
 X: 0	Y: 0
 
 Observation Point: 1	Story Index: 	0
-X: 0	Y: 0
+X: 316.646	Y: 367.066
 
 Observation Point: 1	Story Index: 	1
-X: 0	Y: 0
+X: 329.614	Y: 366.791
 
 Observation Point: 1	Story Index: 	2
 X: 0	Y: 0

File data/observation/Detected 3D reconstructed corner.txt

-1 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
-2 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
+1 floor:	<0>	1	<1>	0	<2>	0	<3>	1	
+2 floor:	<0>	1	<1>	0	<2>	0	<3>	1	
 3 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
 4 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
 5 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
 10 floor:	<0>	0	<1>	0	<2>	0	<3>	0	
 Detected Corner of 3D reconstructed Coordinate
 Corner Point:	0	Story Index:	0
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.03064	Y: -0.02845	Z: 5.33
-Error in	XY:0.0418116	X:	0.03064	Y:	0.02845	Z:	5.33
+Estimated:	X: -0.0327779	Y: 0.0146663	Z: 5.33234
+Actual:	X: -0.03417	Y: 0.01434	Z: 5.33
+Error in	XY:0.00142988	X:	0.00139215	Y:	0.000326298	Z:	0.00234185
 
 Corner Point:	0	Story Index:	1
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.01707	Y: -0.03825	Z: 9.53
-Error in	XY:0.0418861	X:	0.01707	Y:	0.03825	Z:	9.53
+Estimated:	X: -0.0158456	Y: 0.00627626	Z: 9.52731
+Actual:	X: -0.01481	Y: 0.00601	Z: 9.53
+Error in	XY:0.00106929	X:	0.00103561	Y:	0.000266262	Z:	0.00268836
 
 Corner Point:	0	Story Index:	2
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.00685	Y: 0.02332	Z: 13.73
-Error in	XY:0.0243052	X:	0.00685	Y:	0.02332	Z:	13.73
+Actual:	X: -0.03996	Y: -0.01592	Z: 13.73
+Error in	XY:0.0430145	X:	0.03996	Y:	0.01592	Z:	13.73
 
 Corner Point:	0	Story Index:	3
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.0049	Y: 0.01864	Z: 17.93
-Error in	XY:0.0192733	X:	0.0049	Y:	0.01864	Z:	17.93
+Actual:	X: -0.00404	Y: 0.01748	Z: 17.93
+Error in	XY:0.0179408	X:	0.00404	Y:	0.01748	Z:	17.93
 
 Corner Point:	0	Story Index:	4
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.01408	Y: 0.02202	Z: 22.13
-Error in	XY:0.0261367	X:	0.01408	Y:	0.02202	Z:	22.13
+Actual:	X: 0.00442	Y: 0.01677	Z: 22.13
+Error in	XY:0.0173427	X:	0.00442	Y:	0.01677	Z:	22.13
 
 Corner Point:	0	Story Index:	5
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.03969	Y: -0.03882	Z: 26.33
-Error in	XY:0.0555184	X:	0.03969	Y:	0.03882	Z:	26.33
+Actual:	X: -0.02558	Y: 0.02225	Z: 26.33
+Error in	XY:0.0339028	X:	0.02558	Y:	0.02225	Z:	26.33
 
 Corner Point:	0	Story Index:	6
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.03967	Y: 0.03713	Z: 30.53
-Error in	XY:0.0543355	X:	0.03967	Y:	0.03713	Z:	30.53
+Actual:	X: -0.00144	Y: -0.00689	Z: 30.53
+Error in	XY:0.00703887	X:	0.00144	Y:	0.00689	Z:	30.53
 
 Corner Point:	0	Story Index:	7
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.00812	Y: -0.02378	Z: 34.73
-Error in	XY:0.0251281	X:	0.00812	Y:	0.02378	Z:	34.73
+Actual:	X: -0.03885	Y: 0.02932	Z: 34.73
+Error in	XY:0.0486722	X:	0.03885	Y:	0.02932	Z:	34.73
 
 Corner Point:	0	Story Index:	8
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.02219	Y: 0.01584	Z: 38.93
-Error in	XY:0.0272636	X:	0.02219	Y:	0.01584	Z:	38.93
+Actual:	X: -0.01829	Y: -0.02311	Z: 38.93
+Error in	XY:0.029472	X:	0.01829	Y:	0.02311	Z:	38.93
 
 Corner Point:	0	Story Index:	9
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.03305	Y: -0.01419	Z: 43.13
-Error in	XY:0.0359675	X:	0.03305	Y:	0.01419	Z:	43.13
+Actual:	X: 0.02042	Y: 0.0251	Z: 43.13
+Error in	XY:0.0323572	X:	0.02042	Y:	0.0251	Z:	43.13
 
 /**********************************************************/
 Corner Point:	1	Story Index:	0
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7306	Y: 0.01463	Z: 5.33
-Error in	XY:45.7306	X:	45.7306	Y:	0.01463	Z:	5.33
+Estimated:	X: 45.6672	Y: 0	Z: 0
+Actual:	X: 45.6658	Y: 0.01173	Z: 5.33
+Error in	XY:0.0118126	X:	0.0013942	Y:	0.01173	Z:	5.33
 
 Corner Point:	1	Story Index:	1
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6829	Y: 0.01997	Z: 9.53
-Error in	XY:45.6829	X:	45.6829	Y:	0.01997	Z:	9.53
+Estimated:	X: 45.6842	Y: 0	Z: 0
+Actual:	X: 45.6852	Y: 0.00803	Z: 9.53
+Error in	XY:0.00809619	X:	0.00103314	Y:	0.00803	Z:	9.53
 
 Corner Point:	1	Story Index:	2
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6931	Y: 0.00418	Z: 13.73
-Error in	XY:45.6931	X:	45.6931	Y:	0.00418	Z:	13.73
+Actual:	X: 45.66	Y: 0.02274	Z: 13.73
+Error in	XY:45.66	X:	45.66	Y:	0.02274	Z:	13.73
 
 Corner Point:	1	Story Index:	3
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7049	Y: 0.01397	Z: 17.93
-Error in	XY:45.7049	X:	45.7049	Y:	0.01397	Z:	17.93
+Actual:	X: 45.696	Y: -0.02109	Z: 17.93
+Error in	XY:45.696	X:	45.696	Y:	0.02109	Z:	17.93
 
 Corner Point:	1	Story Index:	4
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7141	Y: -0.00826	Z: 22.13
-Error in	XY:45.7141	X:	45.7141	Y:	0.00826	Z:	22.13
+Actual:	X: 45.7044	Y: 0.03862	Z: 22.13
+Error in	XY:45.7044	X:	45.7044	Y:	0.03862	Z:	22.13
 
 Corner Point:	1	Story Index:	5
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6603	Y: -0.02819	Z: 26.33
-Error in	XY:45.6603	X:	45.6603	Y:	0.02819	Z:	26.33
+Actual:	X: 45.6744	Y: 0.01344	Z: 26.33
+Error in	XY:45.6744	X:	45.6744	Y:	0.01344	Z:	26.33
 
 Corner Point:	1	Story Index:	6
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7397	Y: -0.03738	Z: 30.53
-Error in	XY:45.7397	X:	45.7397	Y:	0.03738	Z:	30.53
+Actual:	X: 45.6986	Y: -0.02656	Z: 30.53
+Error in	XY:45.6986	X:	45.6986	Y:	0.02656	Z:	30.53
 
 Corner Point:	1	Story Index:	7
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6919	Y: 0.0182	Z: 34.73
-Error in	XY:45.6919	X:	45.6919	Y:	0.0182	Z:	34.73
+Actual:	X: 45.6612	Y: -0.03386	Z: 34.73
+Error in	XY:45.6612	X:	45.6612	Y:	0.03386	Z:	34.73
 
 Corner Point:	1	Story Index:	8
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6778	Y: 0.01055	Z: 38.93
-Error in	XY:45.6778	X:	45.6778	Y:	0.01055	Z:	38.93
+Actual:	X: 45.6817	Y: 0.00775	Z: 38.93
+Error in	XY:45.6817	X:	45.6817	Y:	0.00775	Z:	38.93
 
 Corner Point:	1	Story Index:	9
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.667	Y: -0.02692	Z: 43.13
-Error in	XY:45.667	X:	45.667	Y:	0.02692	Z:	43.13
+Actual:	X: 45.7204	Y: -0.03901	Z: 43.13
+Error in	XY:45.7204	X:	45.7204	Y:	0.03901	Z:	43.13
 
 /**********************************************************/
 Corner Point:	2	Story Index:	0
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6715	Y: 30.5146	Z: 5.33
-Error in	XY:54.9275	X:	45.6715	Y:	30.5146	Z:	5.33
+Actual:	X: 45.7248	Y: 30.5117	Z: 5.33
+Error in	XY:54.9702	X:	45.7248	Y:	30.5117	Z:	5.33
 
 Corner Point:	2	Story Index:	1
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6851	Y: 30.52	Z: 9.53
-Error in	XY:54.9417	X:	45.6851	Y:	30.52	Z:	9.53
+Actual:	X: 45.6693	Y: 30.508	Z: 9.53
+Error in	XY:54.922	X:	45.6693	Y:	30.508	Z:	9.53
 
 Corner Point:	2	Story Index:	2
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6759	Y: 30.5042	Z: 13.73
-Error in	XY:54.9253	X:	45.6759	Y:	30.5042	Z:	13.73
+Actual:	X: 45.6889	Y: 30.5227	Z: 13.73
+Error in	XY:54.9465	X:	45.6889	Y:	30.5227	Z:	13.73
 
 Corner Point:	2	Story Index:	3
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6895	Y: 30.514	Z: 17.93
-Error in	XY:54.9421	X:	45.6895	Y:	30.514	Z:	17.93
+Actual:	X: 45.6956	Y: 30.4789	Z: 17.93
+Error in	XY:54.9277	X:	45.6956	Y:	30.4789	Z:	17.93
 
 Corner Point:	2	Story Index:	4
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7367	Y: 30.4917	Z: 22.13
-Error in	XY:54.969	X:	45.7367	Y:	30.4917	Z:	22.13
+Actual:	X: 45.7093	Y: 30.5386	Z: 22.13
+Error in	XY:54.9722	X:	45.7093	Y:	30.5386	Z:	22.13
 
 Corner Point:	2	Story Index:	5
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6682	Y: 30.4718	Z: 26.33
-Error in	XY:54.9009	X:	45.6682	Y:	30.4718	Z:	26.33
+Actual:	X: 45.6941	Y: 30.5134	Z: 26.33
+Error in	XY:54.9456	X:	45.6941	Y:	30.5134	Z:	26.33
 
 Corner Point:	2	Story Index:	6
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7223	Y: 30.4626	Z: 30.53
-Error in	XY:54.9409	X:	45.7223	Y:	30.4626	Z:	30.53
+Actual:	X: 45.6807	Y: 30.4734	Z: 30.53
+Error in	XY:54.9123	X:	45.6807	Y:	30.4734	Z:	30.53
 
 Corner Point:	2	Story Index:	7
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.6725	Y: 30.5182	Z: 34.73
-Error in	XY:54.9303	X:	45.6725	Y:	30.5182	Z:	34.73
+Actual:	X: 45.6668	Y: 30.4661	Z: 34.73
+Error in	XY:54.8966	X:	45.6668	Y:	30.4661	Z:	34.73
 
 Corner Point:	2	Story Index:	8
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7359	Y: 30.5105	Z: 38.93
-Error in	XY:54.9788	X:	45.7359	Y:	30.5105	Z:	38.93
+Actual:	X: 45.7001	Y: 30.5077	Z: 38.93
+Error in	XY:54.9474	X:	45.7001	Y:	30.5077	Z:	38.93
 
 Corner Point:	2	Story Index:	9
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 45.7237	Y: 30.4731	Z: 43.13
-Error in	XY:54.9478	X:	45.7237	Y:	30.4731	Z:	43.13
+Actual:	X: 45.7178	Y: 30.461	Z: 43.13
+Error in	XY:54.9363	X:	45.7178	Y:	30.461	Z:	43.13
 
 /**********************************************************/
 Corner Point:	3	Story Index:	0
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.02849	Y: 30.4715	Z: 5.33
-Error in	XY:30.4716	X:	0.02849	Y:	30.4715	Z:	5.33
+Estimated:	X: 0	Y: 30.5147	Z: 0
+Actual:	X: 0.02475	Y: 30.5143	Z: 5.33
+Error in	XY:0.0247522	X:	0.02475	Y:	0.000326852	Z:	5.33
 
 Corner Point:	3	Story Index:	1
-Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.01494	Y: 30.4618	Z: 9.53
-Error in	XY:30.4618	X:	0.01494	Y:	30.4618	Z:	9.53
+Estimated:	X: 0	Y: 30.5063	Z: 0
+Actual:	X: -0.03065	Y: 30.506	Z: 9.53
+Error in	XY:0.0306512	X:	0.03065	Y:	0.000266207	Z:	9.53
 
 Corner Point:	3	Story Index:	2
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.02412	Y: 30.5233	Z: 13.73
-Error in	XY:30.5233	X:	0.02412	Y:	30.5233	Z:	13.73
+Actual:	X: -0.01106	Y: 30.4841	Z: 13.73
+Error in	XY:30.4841	X:	0.01106	Y:	30.4841	Z:	13.73
 
 Corner Point:	3	Story Index:	3
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.01053	Y: 30.5186	Z: 17.93
-Error in	XY:30.5186	X:	0.01053	Y:	30.5186	Z:	17.93
+Actual:	X: -0.00441	Y: 30.5175	Z: 17.93
+Error in	XY:30.5175	X:	0.00441	Y:	30.5175	Z:	17.93
 
 Corner Point:	3	Story Index:	4
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.03667	Y: 30.522	Z: 22.13
-Error in	XY:30.522	X:	0.03667	Y:	30.522	Z:	22.13
+Actual:	X: 0.00929	Y: 30.5168	Z: 22.13
+Error in	XY:30.5168	X:	0.00929	Y:	30.5168	Z:	22.13
 
 Corner Point:	3	Story Index:	5
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.03184	Y: 30.4612	Z: 26.33
-Error in	XY:30.4612	X:	0.03184	Y:	30.4612	Z:	26.33
+Actual:	X: -0.00589	Y: 30.5222	Z: 26.33
+Error in	XY:30.5222	X:	0.00589	Y:	30.5222	Z:	26.33
 
 Corner Point:	3	Story Index:	6
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.02231	Y: 30.5371	Z: 30.53
-Error in	XY:30.5371	X:	0.02231	Y:	30.5371	Z:	30.53
+Actual:	X: -0.01931	Y: 30.4931	Z: 30.53
+Error in	XY:30.4931	X:	0.01931	Y:	30.4931	Z:	30.53
 
 Corner Point:	3	Story Index:	7
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: -0.02748	Y: 30.4762	Z: 34.73
-Error in	XY:30.4762	X:	0.02748	Y:	30.4762	Z:	34.73
+Actual:	X: -0.03323	Y: 30.5293	Z: 34.73
+Error in	XY:30.5293	X:	0.03323	Y:	30.5293	Z:	34.73
 
 Corner Point:	3	Story Index:	8
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.03589	Y: 30.5158	Z: 38.93
-Error in	XY:30.5159	X:	0.03589	Y:	30.5158	Z:	38.93
+Actual:	X: 6e-005	Y: 30.4769	Z: 38.93
+Error in	XY:30.4769	X:	6e-005	Y:	30.4769	Z:	38.93
 
 Corner Point:	3	Story Index:	9
 Estimated:	X: 0	Y: 0	Z: 0
-Actual:	X: 0.02365	Y: 30.4858	Z: 43.13
-Error in	XY:30.4858	X:	0.02365	Y:	30.4858	Z:	43.13
+Actual:	X: 0.01784	Y: 30.5251	Z: 43.13
+Error in	XY:30.5251	X:	0.01784	Y:	30.5251	Z:	43.13
 
 /**********************************************************/
 /**********************************************************/
 Error Statistics:
-MAX	XY: 54.9788	Z: 43.13
-MIN	XY: 0.0192733	Z: 5.33
-AVG	XY: 32.7923	Z: 24.23
-STDEV	XY: 20.8288	Z: 12.0636
+MAX	XY: 54.9722	Z: 43.13
+MIN	XY: 0.00106929	Z: 0.00234185
+AVG	XY: 28.9812	Z: 23.8586
+STDEV	XY: 22.7649	Z: 12.6652

File data/observation/ViewportAndShakeInterval.txt

 Width		Height
-960	1200
+682	738
 Shake Interval
 0.04

File data/observation/edge endpoints.txt

 
 Observation Point: 0	Story Index: 0
 Line:
-466.625 1154.38 466.625 489.375
+320.625 15.625 320.625 274.375
 
 Observation Point: 0	Story Index: 1
 Line:
-456.517 70.625 456.51 691.875
+331.128 15.624 332.563 736.876
 
 Observation Point: 0	Story Index: 2
 Line:
 
 Observation Point: 1	Story Index: 0
 Line:
-481.562 25.625 481.572 979.375
+316.629 605.625 316.62 736.875
 
 Observation Point: 1	Story Index: 1
 Line:
-475.565 25.625 475.47 804.375
+329.602 110.625 329.632 736.875
 
 Observation Point: 1	Story Index: 2
 Line:

File data/observation/perspective projection matrix.txt

 
 Observation Point: 0	Story Index: 0
 P=
-1.812921e+004 -2.928544e+004 3.870087e+001 1.664172e+004 
-4.967280e+003 2.980368e+003 -6.417139e+004 3.630935e+005 
+1.287930e+004 -2.080487e+004 2.749374e+001 1.182255e+004 
+3.096271e+003 1.857763e+003 -4.000017e+004 2.263283e+005 
 8.547012e-001 5.128207e-001 8.062681e-002 3.467024e+001 
 
 
 Observation Point: 0	Story Index: 1
 P=
-1.812249e+004 -2.928948e+004 9.456067e+001 1.622765e+004 
-1.138832e+004 6.832992e+003 -6.304872e+004 6.222653e+005 
+1.270623e+004 -2.052725e+004 6.717748e+001 1.152839e+004 
+7.003817e+003 4.202290e+003 -3.877496e+004 3.826931e+005 
 8.406888e-001 5.044133e-001 1.970014e-001 3.380760e+001 
 
 
 
 Observation Point: 1	Story Index: 0
 P=
-2.977775e+004 -1.730870e+004 3.870087e+001 1.664172e+004 
-2.980368e+003 4.967280e+003 -6.417139e+004 3.630935e+005 
+2.087413e+004 -1.212810e+004 2.749374e+001 1.182255e+004 
+1.832926e+003 3.054877e+003 -3.946541e+004 2.233025e+005 
 5.128207e-001 8.547012e-001 8.062681e-002 3.467024e+001 
 
 
 Observation Point: 1	Story Index: 1
 P=
-2.977371e+004 -1.731543e+004 9.456067e+001 1.622765e+004 
-6.832992e+003 1.138832e+004 -6.304872e+004 6.222653e+005 
+2.087126e+004 -1.213288e+004 6.717748e+001 1.152839e+004 
+4.202290e+003 7.003817e+003 -3.877496e+004 3.826931e+005 
 5.044133e-001 8.406888e-001 1.970014e-001 3.380760e+001 
 
 
 
 Observation Point: 4	Story Index: 5
 P=
--1.828684e+004 2.918608e+004 2.675176e+002 -4.098705e+004 
--3.107267e+004 -1.897177e+004 -5.316094e+004 3.424042e+006 
+-1.299127e+004 2.073427e+004 1.900490e+002 -2.911791e+004 
+-1.936863e+004 -1.182573e+004 -3.313698e+004 2.134320e+006 
 -7.086466e-001 -4.326720e-001 5.573284e-001 7.366475e+001 
 
 

File errorAna/errorAna.vcproj

 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="osgdbd.lib osgGAd.lib osgViewerd.lib osgUtild.lib osgTextd.lib osgd.lib opencv_core231d.lib opencv_calib3d231d.lib"
+				AdditionalDependencies="osgdbd.lib osgGAd.lib osgViewerd.lib osgUtild.lib osgTextd.lib osgd.lib opencv_core240d.lib opencv_calib3d240d.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="osgdb.lib osgGA.lib osgViewer.lib osgUtil.lib osgText.lib osg.lib opencv_core231.lib opencv_calib3d231.lib"
+				AdditionalDependencies="osgdb.lib osgGA.lib osgViewer.lib osgUtil.lib osgText.lib osg.lib opencv_core240.lib opencv_calib3d240.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"