Changeset 3038 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

Timestamp:

10/17/08 16:32:37 (16 years ago)

Author:

mattausch

Message:

unified shader stuff, but phreetham sky not working anymore for forward rendering

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

@@ -9 +9 @@
 #include "Shape.h"
 #include "Material.h"
+#include "ResourceManager.h"
+
 
 
@@ -22 +24 @@
 
 
+
+
 using namespace CHCDemoEngine;
 using namespace std;
 
 
-static ShaderProgram *sCgSkyProgram = NULL;
-static ShaderProgram *sCgMrtFragmentSkyDomeProgram = NULL;
-
-ShaderContainer SkyPreetham::sShaders;
-
 
 inline float CBQ(float x)
@@ -44 +43 @@
 
 
-void SkyPreetham::InitCG(CGcontext context)
+void SkyPreetham::InitCG()
 {       
-        sCgSkyProgram = new ShaderProgram(context, 
-                                              "src/shaders/sky_preetham.cg",
-                                                                          RenderState::sCgVertexProfile,        
-                                                                          "default_vs");
-
-        if (sCgSkyProgram->IsValid())
+        mSkyVtxProgram = 
+                ResourceManager::GetSingleton()->CreateVertexProgram("sky_preetham", "default_vs");
+                
+        if (mSkyVtxProgram->IsValid())
         {
-                sCgSkyProgram->AddParameter("lightDir", 0);
-                sCgSkyProgram->AddParameter("thetaSun", 1);
-                sCgSkyProgram->AddParameter("zenithColor", 2);
-                sCgSkyProgram->AddParameter("aColor", 3);
-                sCgSkyProgram->AddParameter("bColor", 4);
-                sCgSkyProgram->AddParameter("cColor", 5);
-                sCgSkyProgram->AddParameter("dColor", 6);
-                sCgSkyProgram->AddParameter("eColor", 7);
-                sCgSkyProgram->AddParameter("multiplier", 8);
+                mSkyVtxProgram->AddParameter("lightDir", 0);
+                mSkyVtxProgram->AddParameter("thetaSun", 1);
+                mSkyVtxProgram->AddParameter("zenithColor", 2);
+                mSkyVtxProgram->AddParameter("aColor", 3);
+                mSkyVtxProgram->AddParameter("bColor", 4);
+                mSkyVtxProgram->AddParameter("cColor", 5);
+                mSkyVtxProgram->AddParameter("dColor", 6);
+                mSkyVtxProgram->AddParameter("eColor", 7);
+                mSkyVtxProgram->AddParameter("multiplier", 8);
         }
         else
                 cerr << "sky program failed to load" << endl;
 
-                sShaders.push_back(sCgSkyProgram);
-
-        sCgMrtFragmentSkyDomeProgram = 
-                new ShaderProgram(context, 
-                                  "src/shaders/sky_preetham.cg", 
-                                                  RenderState::sCgFragmentProfile,
-                                                  "frag_skydome");
-
-        // simple shader used for just pushing out the fragments to the mrts
-        if (!sCgMrtFragmentSkyDomeProgram->IsValid())
-                cerr << "fragment skyprogram failed to load" << endl;
-        
-        sShaders.push_back(sCgMrtFragmentSkyDomeProgram);
-}
-
-
-void SkyPreetham::ReleaseCG()
-{
-        CLEAR_CONTAINER(sShaders);
+        mSkyFragProgram = 
+                ResourceManager::GetSingleton()->CreateFragmentProgram("sky_preetham", "frag_skydome");
 }
 
@@ -96 +76 @@
         Shape *shape = mSkyDome->GetShape(0);
 
+        InitCG();
+
         Material *mat = shape->GetMaterial();
 
-        mat->SetFragmentProgram(sCgMrtFragmentSkyDomeProgram);
-        mat->SetVertexProgram(sCgSkyProgram);
+        mat->SetFragmentProgram(mSkyFragProgram);
+        mat->SetVertexProgram(mSkyVtxProgram);
 }
 
@@ -148 +130 @@
         {       
                 // use tone mapping
-                sCgSkyProgram->SetValue1f(8, 1.0f);
+                vtxParams->SetValue1f(8, 1.0f);
         }
         else
         {
                 // no tone mapping => scale
-                sCgSkyProgram->SetValue1f(8, 8e-5f);
+                vtxParams->SetValue1f(8, 8e-5f);
         }
-
-        cgGLEnableProfile(RenderState::sCgVertexProfile);
 
         // Render sky dome.