Changeset 1611 for GTP

Timestamp:

10/11/06 16:08:34 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre

Files:

• Media/materials/programs/GameTools_Phong.hlsl (modified) (2 diffs)
• Media/materials/scripts/Glow.material (modified) (1 diff)
• Media/materials/scripts/Ogre.material (modified) (1 diff)
• Media/materials/scripts/diffscene.material (modified) (2 diffs)
• src/DiffuseTest/include/DiffuseTest.h (modified) (6 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs/GameTools_Phong.hlsl

@@ -60 +60 @@
     float3 pos = IN.wPos;
     
-    float M = 4;
+    float M = 1;
    
     float3 lightpositions[8];
@@ -92 +92 @@
         L = normalize(L);
         float3 H = normalize(L + V);
-        float lightscale = 3;
+        float lightscale = 1.0;
         float4 spec = specular * lightcolors[i] * pow(dot(H, N), shininess) * lightscale;
         float4 diff = diffuse * lightcolors[i] * abs(dot(L, N)) * lightscale;

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/Glow.material

@@ -51 +51 @@
                 param_named_auto height viewport_height
                 //param_named cutValue float 10.0
-                param_named cutValue float 10.0
-                param_named timeBlur float 0.4
+                param_named cutValue float 10.5
+                param_named timeBlur float 0.5
                 
          }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/Ogre.material

@@ -48 +48 @@
                         {
                                 texture dirt01.jpg
-                                colour_op_ex add src_texture src_current
-                                colour_op_multipass_fallback one one
+                                //colour_op_ex add src_texture src_current
+                                //colour_op_multipass_fallback one one
                         }
                 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/diffscene.material

@@ -192 +192 @@
                                 texture talaj.jpg
                                 tex_coord_set 0
-                                colour_op modulate
+                                colour_op replace
                                 
 
@@ -207 +207 @@
                         cull_hardware none
 
-                        ambient 1 0.408055 0.07 0.79488
-                        diffuse 1 0.408055 0.07 0.79488
+                        ambient 1 0.408055 0.07 0.9
+                        diffuse 1 0.408055 0.07 0.9
                         specular 0 0 0 0
                         emissive 0.3 0.15 0.03

GTP/trunk/App/Demos/Illum/Ogre/src/DiffuseTest/include/DiffuseTest.h

@@ -24 +24 @@
 */
 
-
 #include "ExampleApplication.h"
 #include "OgreIlluminationManager.h"
@@ -30 +29 @@
 float causize = 10;
 float cauintens = 40;
-
+int scene = 1;
 // Listener class for frame updates
 class RaytraceDemoListener : public ExampleFrameListener
@@ -321 +320 @@
     {
 
-        //      createPostproc();
+                //createPostproc();
                 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
@@ -335 +334 @@
                 mCamera->setNearClipDistance(0.1);
                 
-                //createScene1();
+                if(scene == 1)
+                createScene1();
+                else
                 createScene2();
                 
@@ -355 +356 @@
                 SceneNode* rootNode = mSceneMgr->getRootSceneNode();
 
-        Entity* object = mSceneMgr->createEntity("object", "athene.mesh");
+        Entity* object = mSceneMgr->createEntity("object", "chinaman.mesh");
                 object->setMaterialName("GameTools/Diffuse/use");
                 //object->setMaterialName("GameTools/Diffuse2");
                 objectNode = rootNode->createChildSceneNode();
                 objectNode->attachObject(object);
-                objectNode->scale(0.05,0.05,0.05);
-                objectNode->setPosition(0,4,0);
+        //      objectNode->scale(0.05,0.05,0.05);
+                objectNode->scale(3,3,3);
+        //      objectNode->setPosition(0,4,0);                 
                 objectNode->_updateBounds();
 
@@ -591 +593 @@
         mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
                 mRoot->addFrameListener(mFrameListener);
+                if(scene == 2)
                 mRoot->addFrameListener(reflListener);