Browse Source

Revert the change to use the wind shader in StaticScene example (as it is no longer static in that case.)

Lasse Öörni 11 years ago
parent
commit
ba131a3e2b
2 changed files with 2 additions and 4 deletions
  1. 1 2
      Bin/Data/LuaScripts/04_StaticScene.lua
  2. 1 2
      Bin/Data/Scripts/04_StaticScene.as

+ 1 - 2
Bin/Data/LuaScripts/04_StaticScene.lua

@@ -3,7 +3,6 @@
 --     - Creating a 3D scene with static content
 --     - Creating a 3D scene with static content
 --     - Displaying the scene using the Renderer subsystem
 --     - Displaying the scene using the Renderer subsystem
 --     - Handling keyboard and mouse input to move a freelook camera
 --     - Handling keyboard and mouse input to move a freelook camera
---     - Applying a material shader to animate vegetation (simulate wind)
 
 
 require "LuaScripts/Utilities/Sample"
 require "LuaScripts/Utilities/Sample"
 
 
@@ -64,7 +63,7 @@ function CreateScene()
         mushroomNode:SetScale(0.5 + Random(2.0))
         mushroomNode:SetScale(0.5 + Random(2.0))
         local mushroomObject = mushroomNode:CreateComponent("StaticModel")
         local mushroomObject = mushroomNode:CreateComponent("StaticModel")
         mushroomObject.model = cache:GetResource("Model", "Models/Mushroom.mdl")
         mushroomObject.model = cache:GetResource("Model", "Models/Mushroom.mdl")
-        mushroomObject.material = cache:GetResource("Material", "Materials/MushroomWind.xml") -- Apply Vegetation Windy shader
+        mushroomObject.material = cache:GetResource("Material", "Materials/Mushroom.xml")
     end
     end
 
 
     -- Create a scene node for the camera, which we will move around
     -- Create a scene node for the camera, which we will move around

+ 1 - 2
Bin/Data/Scripts/04_StaticScene.as

@@ -3,7 +3,6 @@
 //     - Creating a 3D scene with static content
 //     - Creating a 3D scene with static content
 //     - Displaying the scene using the Renderer subsystem
 //     - Displaying the scene using the Renderer subsystem
 //     - Handling keyboard and mouse input to move a freelook camera
 //     - Handling keyboard and mouse input to move a freelook camera
-//     - Applying a material shader to animate vegetation (simulate wind)
 
 
 #include "Scripts/Utilities/Sample.as"
 #include "Scripts/Utilities/Sample.as"
 
 
@@ -67,7 +66,7 @@ void CreateScene()
         mushroomNode.SetScale(0.5f + Random(2.0f));
         mushroomNode.SetScale(0.5f + Random(2.0f));
         StaticModel@ mushroomObject = mushroomNode.CreateComponent("StaticModel");
         StaticModel@ mushroomObject = mushroomNode.CreateComponent("StaticModel");
         mushroomObject.model = cache.GetResource("Model", "Models/Mushroom.mdl");
         mushroomObject.model = cache.GetResource("Model", "Models/Mushroom.mdl");
-        mushroomObject.material = cache.GetResource("Material", "Materials/MushroomWind.xml"); // Apply Vegetation Windy shader
+        mushroomObject.material = cache.GetResource("Material", "Materials/Mushroom.xml");
     }
     }
 
 
     // Create a scene node for the camera, which we will move around
     // Create a scene node for the camera, which we will move around