Changeset 527 for trunk

Timestamp:

01/12/06 15:25:56 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/GlRenderer.cpp (modified) (3 diffs)
• src/RssPreprocessor.cpp (modified) (2 diffs)
• src/ViewCellsManager.cpp (modified) (1 diff)
• src/ViewCellsManager.h (modified) (1 diff)
• src/VssPreprocessor.cpp (modified) (1 diff)
• src/dual_depth.cg (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -135 +135 @@
                         </File>
                         <File
+                                RelativePath="..\src\dual_depth.cg">
+                        </File>
+                        <File
                                 RelativePath="..\src\Environment.cpp">
                         </File>

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -13 +13 @@
 static CGcontext sCgContext = NULL;
 static CGprogram sCgFragmentProgram = NULL;
-
-static CGparameter sCgKdParam = NULL;
-static CGparameter sCgModelViewProjParam = NULL;
-
-
-static CGprofile sCgFragmentProfile = CG_PROFILE_FP30;
+static CGprofile sCgFragmentProfile;// = CG_PROFILE_FP30;
+
+//static CGparameter sCgKdParam = NULL;
+//static CGparameter sCgModelViewProjParam = NULL;
 
 GLuint depthMap;
@@ -157 +155 @@
   sCgContext = cgCreateContext();
 
-  /*sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,            
+  sCgFragmentProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT);
+
+  sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,              
                                                                                            CG_SOURCE, "../src/dual_depth.cg",
                                                                                            sCgFragmentProfile,
                                                                                            NULL, 
-                                                                                           NULL);*/
+                                                                                           NULL);
 }
 
@@ -585 +585 @@
         glShadeModel(GL_FLAT);
         glDisable(GL_LIGHTING);
+        // needed to kill fragments
+        glEnable(GL_ALPHA_TEST);
+        glAlphaFunc(GL_GREATER, 0);
 
         // assumes that the beam is constructed and contains kd-tree nodes

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -522 +522 @@
         mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
   }
-                
+  
+  //-- load view cells from file if requested
+  if (mLoadViewCells)
+  {     
+          // load now because otherwise bounding box not correct
+          mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
+  }
 
   RssTree *rssTree = NULL;
@@ -645 +651 @@
   rssTree->SetPass(mPass);
   
+  /// compute view cell contribution of rays if view cells manager already constructed
+  mViewCellsManager->ComputeSampleContributions(mVssRays);
+
   if (mUseImportanceSampling) {
         

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -70 +70 @@
 }
 
+
+int ViewCellsManager::Construct(VssRayContainer &rays)
+{
+        return 0;
+}
 
 bool ViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -53 +53 @@
         virtual ~ViewCellsManager();
 
+        /** Constructs view cells container taking a preprocessor
+                @returns construction rays.
+        */
+        int Construct(VssRayContainer &rays);
+
         /** Constructs view cell container with a given number of samples.
         */

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -403 +403 @@
 
   //-- load view cells from file if requested
-  // load now because otherwise bounding box is messed up
   if (mLoadViewCells)
-  {
+  {     
+          // load now because otherwise bounding box not correct
           mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
   }

trunk/VUT/GtpVisibilityPreprocessor/src/dual_depth.cg

@@ -25 +25 @@
         
         // the depth buffer     
-        float4 depth = tex2Dproj(shadowMap, IN.SMTexCoord);
+        float4 depth = tex2Dproj(shadowMap, IN.depthTexCoord);
         float test = IN.depthTexCoord.z / IN.depthTexCoord.w;
-        
-        float shadow;
-        shadow = (test < depth.x) ? 1.0 : 0.0;
-        OUT.color = localcolor * shadow * IN.color1;
+        // reject by alpha test
+        if (test < depth.x)
+                col[4] = 0;
+                
+        //OUT.color = localcolor * shadow * IN.color1;
 
         return OUT;