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

Timestamp:

10/17/08 01:08:42 (16 years ago)

Author:

mattausch

Message:

shader system starting to work

File:

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

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

@@ -6 +6 @@
 #include "Camera.h"
 #include "RenderState.h"
+#include "ShaderProgram.h"
+#include "Shape.h"
+#include "Material.h"
 
 
@@ -23 +26 @@
 
 
-static CGprogram sCgSkyProgram = NULL;
-static CGprogram sCgMrtFragmentSkyDomeProgram = NULL;
-
-
-static CGparameter sLightDirParam;
-static CGparameter sThetaSunParam;
-static CGparameter sZenithColorParam;
-static CGparameter sAColorParam;
-static CGparameter sBColorParam;
-static CGparameter sCColorParam;
-static CGparameter sDColorParam;
-static CGparameter sEColorParam;
-static CGparameter sMultiplierParam;
+static ShaderProgram *sCgSkyProgram = NULL;
+static ShaderProgram *sCgMrtFragmentSkyDomeProgram = NULL;
 
 ShaderContainer SkyPreetham::sShaders;
@@ -54 +46 @@
 void SkyPreetham::InitCG(CGcontext context)
 {       
-        ShaderProgram *pr;
-
-        sCgSkyProgram = 
-                cgCreateProgramFromFile(context, 
-                                                                CG_SOURCE,
-                                                                "src/shaders/sky_preetham.cg", 
-                                                                RenderState::sCgVertexProfile,
-                                                                "default_vs",
-                                                                NULL);
-
-        if (sCgSkyProgram != NULL)
+        sCgSkyProgram = new ShaderProgram(context, 
+                                              "src/shaders/sky_preetham.cg",
+                                                                          RenderState::sCgVertexProfile,        
+                                                                          "default_vs");
+
+        if (sCgSkyProgram->IsValid())
         {
-                cgGLLoadProgram(sCgSkyProgram);
-
-                sLightDirParam = cgGetNamedParameter(sCgSkyProgram, "lightDir");
-                sThetaSunParam = cgGetNamedParameter(sCgSkyProgram, "thetaSun");
-                sZenithColorParam = cgGetNamedParameter(sCgSkyProgram, "zenithColor");
-                sAColorParam = cgGetNamedParameter(sCgSkyProgram, "aColor");
-                sBColorParam = cgGetNamedParameter(sCgSkyProgram, "bColor");
-                sCColorParam = cgGetNamedParameter(sCgSkyProgram, "cColor");
-                sDColorParam = cgGetNamedParameter(sCgSkyProgram, "dColor");
-                sEColorParam = cgGetNamedParameter(sCgSkyProgram, "eColor");
-
-                sMultiplierParam = cgGetNamedParameter(sCgSkyProgram, "multiplier");
-
-                pr = new ShaderProgram(sCgSkyProgram);
-                sShaders.push_back(pr);
+                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);
         }
         else
                 cerr << "sky program failed to load" << endl;
 
+                sShaders.push_back(sCgSkyProgram);
+
         sCgMrtFragmentSkyDomeProgram = 
-                cgCreateProgramFromFile(context, 
-                                                                CG_SOURCE,
-                                                                "src/shaders/sky_preetham.cg", 
-                                                                RenderState::sCgFragmentProfile,
-                                                                "frag_skydome",
-                                                                NULL);
-
-        if (sCgMrtFragmentSkyDomeProgram != NULL)
-        {
-                cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
-                //cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
-
-                pr = new ShaderProgram(sCgMrtFragmentSkyDomeProgram);
-                sShaders.push_back(pr);
-        }
-        else
+                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);
 }
 
@@ -118 +94 @@
 {
         CreateSunQuad();
+        Shape *shape = mSkyDome->GetShape(0);
+
+        Material *mat = shape->GetMaterial();
+
+        mat->SetFragmentProgram(sCgMrtFragmentSkyDomeProgram);
+        mat->SetVertexProgram(sCgSkyProgram);
 }
 
@@ -135 +117 @@
         Vector3 zenithColor;
         vector<Vector3> ABCDE;
+
         ComputeFactors(sunDir, zenithColor, ABCDE, sun_theta);
 
@@ -149 +132 @@
         mSkyDome->GetTransform()->SetMatrix(s * m);
         
-        cgGLSetParameter3f(sLightDirParam, sunDir.x, sunDir.y, sunDir.z);
-        cgGLSetParameter2f(sThetaSunParam, sun_theta.first, sun_theta.second);
-        cgGLSetParameter3f(sZenithColorParam, zenithColor.x, zenithColor.y, zenithColor.z);
-
-        cgGLSetParameter3f(sAColorParam, ABCDE[0].x, ABCDE[0].y, ABCDE[0].z);
-        cgGLSetParameter3f(sBColorParam, ABCDE[1].x, ABCDE[1].y, ABCDE[1].z);
-        cgGLSetParameter3f(sCColorParam, ABCDE[2].x, ABCDE[2].y, ABCDE[2].z);
-        cgGLSetParameter3f(sDColorParam, ABCDE[3].x, ABCDE[3].y, ABCDE[3].z);
-        cgGLSetParameter3f(sEColorParam, ABCDE[4].x, ABCDE[4].y, ABCDE[4].z);
-
-        if (state->GetRenderPassType() == RenderState::DEFERRED)
-        {
-                cgGLEnableProfile(RenderState::sCgFragmentProfile);
-                cgGLBindProgram(sCgMrtFragmentSkyDomeProgram);
-
-        }
+        GPUProgramParameters *vtxParams = mSkyDome->GetShape(0)->GetMaterial()->GetVertexProgramParameters();
+
+        vtxParams->SetValue3f(0, sunDir.x, sunDir.y, sunDir.z);
+        vtxParams->SetValue2f(1, sun_theta.first, sun_theta.second);
+        vtxParams->SetValue3f(2, zenithColor.x, zenithColor.y, zenithColor.z);
+
+        vtxParams->SetValue3f(3, ABCDE[0].x, ABCDE[0].y, ABCDE[0].z);
+        vtxParams->SetValue3f(4, ABCDE[1].x, ABCDE[1].y, ABCDE[1].z);
+        vtxParams->SetValue3f(5, ABCDE[2].x, ABCDE[2].y, ABCDE[2].z);
+        vtxParams->SetValue3f(6, ABCDE[3].x, ABCDE[3].y, ABCDE[3].z);
+        vtxParams->SetValue3f(7, ABCDE[4].x, ABCDE[4].y, ABCDE[4].z);
+
 
         if (!scaleToRange)
         {       
                 // use tone mapping
-                cgGLSetParameter1f(sMultiplierParam, 1.0f);
+                sCgSkyProgram->SetValue1f(8, 1.0f);
         }
         else
         {
                 // no tone mapping => scale
-                cgGLSetParameter1f(sMultiplierParam, 8e-5f);
+                sCgSkyProgram->SetValue1f(8, 8e-5f);
         }
 
         cgGLEnableProfile(RenderState::sCgVertexProfile);
-        cgGLBindProgram(sCgSkyProgram);
 
         // Render sky dome.
@@ -185 +163 @@
         // Render additively blended sun disc.
         //RenderSunDisk(sunDir, camera);
-
-        cgGLDisableProfile(RenderState::sCgFragmentProfile);
 }
 
@@ -192 +168 @@
 void SkyPreetham::RenderSunDisk(const Vector3 &sunDir, Camera *camera)
 {
+#if TODOD
         // Move skybox with camera.
         Vector3 position = camera->GetPosition();
@@ -212 +189 @@
         sunPos *= rotx;;
 
-        //sunposition.rotateAroundY(-D().getScene().getLight().getHorizontalOrientation() + 90.0f);
-        //sunposition.rotateAroundX(-D().getScene().getLight().getVerticalOrientation());
+        sunposition.rotateAroundY(-D().getScene().getLight().getHorizontalOrientation() + 90.0f);
+        sunposition.rotateAroundX(-D().getScene().getLight().getVerticalOrientation());
         
         glMatrixMode(GL_MODELVIEW);
@@ -222 +199 @@
         glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
 
-        //Float size = 0.5f + (1.0f - lightdirection.y) * 0.5f;
-
-        //mSunEffect->setVariableVector3("LightDiffuseColor", D().getScene().getLight().getDiffuseColor());
-        //mSunEffect->setVariableFloat("SunSize", size);
-        //mSunEffect->setVariableTexture2D("SunTexture", mSunTexture);
-
-        /*mSunEffect->activate();
+        Float size = 0.5f + (1.0f - lightdirection.y) * 0.5f;
+
+        mSunEffect->setVariableVector3("LightDiffuseColor", D().getScene().getLight().getDiffuseColor());
+        mSunEffect->setVariableFloat("SunSize", size);
+        mSunEffect->setVariableTexture2D("SunTexture", mSunTexture);
+
+        mSunEffect->activate();
         
         mSunQuad->render();
 
         mSunEffect->deactivate();
-        F().getRenderDevice().setDefaultBlendingMode(FRenderDevice::BLENDING_NONE);*/
+        F().getRenderDevice().setDefaultBlendingMode(FRenderDevice::BLENDING_NONE);
 
         glPopMatrix();
+#endif
 }
 
@@ -241 +219 @@
 void SkyPreetham::CreateSunQuad()
 {
-        /*
+#if TODO
         mSunQuad = new FVertexBuffer();
         mSunQuad->setupPrimitiveType(FVertexBuffer::PRIMITIVES_TRIANGLES);
@@ -263 +241 @@
         mSunQuad->setIndex(4, 1);
         mSunQuad->setIndex(5, 3);
-        */
+#endif
 }