Changeset 786

Timestamp:

04/22/06 20:10:15 (18 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE

Files:

• include/LBBC/LBBCBillboardViewMode.h (modified) (1 diff)
• include/LBBC/LBBCClusterViewMode.h (modified) (1 diff)
• media (added)
• media/general (added)
• media/general/customNormalMap128x128.png (added)
• media/general/diffuseTextureScreenAligned_FP20.cg (added)
• media/general/diffuseTextureScreenAligned_VP20.cg (added)
• media/general/diffuse_FP20.cg (added)
• media/general/general.material (added)
• media/general/general.program (added)
• media/general/indirectTexturingDebugEntityPosition_FP20.cg (added)
• media/general/indirectTexturingDebugTexCoordCorrespondence_FP20.cg (added)
• media/general/indirectTexturingDebugTextureAtlasFitting_FP20.cg (added)
• media/general/indirectTexturingPointBasedGeneration_FP20.cg (added)
• media/general/indirectTexturing_FP20.cg (added)
• media/general/indirectTexturing_VP20.cg (added)
• media/general/indirectTexturing_hlsl_FP20.shd (added)
• media/general/indirectTexturing_hlsl_VP20.shd (added)
• media/general/transparent.png (added)
• src/BBCBillboardCloud.cpp (modified) (2 diffs)
• src/LBBCBillboardKMeansClusterData.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCBillboardViewMode.h

@@ -53 +53 @@
                         Ogre::SceneNode* sNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
                         //mBillboardCloudEntity = mSceneMgr->createEntity(mBillboardCloudMeshName, mBillboardCloudMeshName);            
-                        mBillboardCloudEntity = mSceneMgr->createEntity("chestnutLeavesBillboardCloudGrouped.mesh", "chestnutLeavesBillboardCloudGrouped.mesh");                
+                        mBillboardCloudEntity = mSceneMgr->createEntity("chestnutLeavesBillboardCloudGrouped.mesh", "chestnutLeavesBillboardCloudGrouped.mesh");
+                        //mBillboardCloudEntity = mSceneMgr->createEntity("mapleLeavesBillboardCloudGrouped.mesh", "mapleLeavesBillboardCloudGrouped.mesh");            
                         sNode->attachObject(mBillboardCloudEntity);
                         sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBCClusterViewMode.h

@@ -39 +39 @@
                         //Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity(mEntityClustersMeshName, mEntityClustersMeshName);                                       
                         Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("chestnutLeafClustersGrouped.mesh", "chestnutLeafClustersGrouped.mesh");                                                           
+                        //Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("mapleLeafClustersGrouped.mesh", "mapleLeafClustersGrouped.mesh");                                                               
                         sNode->attachObject(eLeafClustersGrouped);                      
                         sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/BBCBillboardCloud.cpp

@@ -102 +102 @@
                         vFaceA1.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
                         vFaceA1.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA1.uv[0] = Ogre::Vector3(0,0,0);
+                        vFaceA1.uv[0] = Ogre::Vector3(1.0 , 0.0, 0.0);
                         vFaceA2.position = billboard->getBillboardClusterData()->getQuadTopRightCorner();
                         vFaceA2.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA2.uv[0] = Ogre::Vector3(1,0,0);
+                        vFaceA2.uv[0] = Ogre::Vector3(0.0, 0.0, 0.0);
                         vFaceA3.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
                         vFaceA3.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA3.uv[0] = Ogre::Vector3(1,1,0);
+                        vFaceA3.uv[0] = Ogre::Vector3(0.0 ,1.0 ,0.0);
 
                         // Face B of the billboard quad
@@ -114 +114 @@
                         vFaceB1.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
                         vFaceB1.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB1.uv[0] = Ogre::Vector3(1,1,0);
+                        vFaceB1.uv[0] = Ogre::Vector3(0.0, 1.0 ,0.0);
                         vFaceB2.position = billboard->getBillboardClusterData()->getQuadBottomLeftCorner();
                         vFaceB2.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB2.uv[0] = Ogre::Vector3(0,1,0);
+                        vFaceB2.uv[0] = Ogre::Vector3(1.0, 1.0, 0.0);
                         vFaceB3.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
                         vFaceB3.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB3.uv[0] = Ogre::Vector3(0,0,0);
+                        vFaceB3.uv[0] = Ogre::Vector3(1.0, 0.0, 0.0);
 
                         subEntity->addUniqueVertex(vFaceA1);

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/LBBCBillboardKMeansClusterData.cpp

@@ -181 +181 @@
         if (iBillboardGroup >= 0)
         {               
-                //uvMapMin = billboardNode->ToElement()->InsertEndChild(TiXmlElement("uvMapMin"))->ToElement();
-                //Ogre::String sUvMapMinX = Ogre::StringConverter::toString(this->getBillboardUVMapMin(iBillboardGroup).x);
-                //uvMapMin->ToElement()->SetAttribute("x",sUvMapMinX.c_str());
-                //Ogre::String sUvMapMinY = Ogre::StringConverter::toString(this->getBillboardUVMapMin(iBillboardGroup).y);
-                //uvMapMin->ToElement()->SetAttribute("y",sUvMapMinY.c_str());
-
-                //uvMapMax = billboardNode->ToElement()->InsertEndChild(TiXmlElement("uvMapMax"))->ToElement();
-                //Ogre::String suvMapMaxX = Ogre::StringConverter::toString(this->getBillboardUVMapMax(iBillboardGroup).x);
-                //uvMapMax->ToElement()->SetAttribute("x",suvMapMaxX.c_str());
-                //Ogre::String suvMapMaxY = Ogre::StringConverter::toString(this->getBillboardUVMapMax(iBillboardGroup).y);
-                //uvMapMax->ToElement()->SetAttribute("y",suvMapMaxY.c_str());
-
                 uvMapMin = billboardNode->ToElement()->InsertEndChild(TiXmlElement("uvMapMin"))->ToElement();
                 Ogre::String sUvMapMinX = Ogre::StringConverter::toString(this->getBillboardUVMapMin(0).x);