Browse Source

Windows updates

Josh Engebretson 11 years ago
parent
commit
49fc9b5f78

+ 5 - 0
Source/Atomic/Graphics/Batch.cpp

@@ -250,6 +250,11 @@ void Batch::Prepare(View* view, bool setModelTransform, bool allowDepthWrite) co
                 graphics->SetShaderParameter(VSP_BILLBOARDROT, cameraNode->GetWorldRotation().RotationMatrix());
         }
     }
+
+    if (lightmapTilingOffset_)
+    {
+        graphics->SetShaderParameter(VSP_LMOFFSET, *lightmapTilingOffset_);
+    }
     
     // Set zone-related shader parameters
     BlendMode blend = graphics->GetBlendMode();

+ 1 - 0
Source/Atomic/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -20,6 +20,7 @@
 // THE SOFTWARE.
 //
 
+#include "Precompiled.h"
 #include "../../Graphics/AnimatedModel.h"
 #include "../../Graphics/Animation.h"
 #include "../../Graphics/AnimationController.h"

+ 1 - 0
Source/Atomic/Graphics/Direct3D9/D3D9ShaderVariation.cpp

@@ -20,6 +20,7 @@
 // THE SOFTWARE.
 //
 
+#include "Precompiled.h"
 #include "../../IO/File.h"
 #include "../../IO/FileSystem.h"
 #include "../../Graphics/Graphics.h"

+ 1 - 1
Source/Atomic/Graphics/Technique.cpp

@@ -85,7 +85,7 @@ Pass::Pass(StringHash type) :
     isDesktop_(false)
 {
     // Guess default lighting mode from pass name
-    if (type == PASS_BASE || type == PASS_ALPHA || type == PASS_MATERIAL || type == PASS_DEFERRED)
+    if (type == PASS_BASE || type == PASS_ALPHA || type == PASS_MATERIAL || type == PASS_DEFERRED || type == PASS_LIGHT2D)
         lightingMode_ = LIGHTING_PERVERTEX;
     else if (type == PASS_LIGHT || type == PASS_LITBASE || type == PASS_LITALPHA)
         lightingMode_ = LIGHTING_PERPIXEL;