Browse Source

Fixed Batch.cpp.

Lasse Öörni 14 years ago
parent
commit
1911a90504
2 changed files with 1 additions and 2 deletions
  1. 1 1
      Engine/Graphics/Batch.cpp
  2. 0 1
      Engine/IO/File.h

+ 1 - 1
Engine/Graphics/Batch.cpp

@@ -239,7 +239,7 @@ void Batch::Prepare(Graphics* graphics, bool SetModelTransform) const
             if ((light_->GetLightType() != LIGHT_DIRECTIONAL) && (fadeEnd > 0.0f) && (fadeStart > 0.0f) && (fadeStart < fadeEnd))
             if ((light_->GetLightType() != LIGHT_DIRECTIONAL) && (fadeEnd > 0.0f) && (fadeStart > 0.0f) && (fadeStart < fadeEnd))
                 fade = Min(1.0f - (light_->GetDistance() - fadeStart) / (fadeEnd - fadeStart), 1.0f);
                 fade = Min(1.0f - (light_->GetDistance() - fadeStart) / (fadeEnd - fadeStart), 1.0f);
             
             
-            graphics->SetPixelShaderParameter(PSP_LIGHTCOLOR, Vector4(light_->GetColor().GetRGB(),
+            graphics->SetPixelShaderParameter(PSP_LIGHTCOLOR, Vector4(light_->GetColor().RGBValues(),
                 light_->GetSpecularIntensity()) * fade);
                 light_->GetSpecularIntensity()) * fade);
         }
         }
         
         

+ 0 - 1
Engine/IO/File.h

@@ -76,7 +76,6 @@ public:
     FileMode GetMode() const { return mode_; }
     FileMode GetMode() const { return mode_; }
     /// Return whether is open
     /// Return whether is open
     bool IsOpen() const { return handle_ != 0; }
     bool IsOpen() const { return handle_ != 0; }
-    
     /// Return the file handle
     /// Return the file handle
     void* GetHandle() const { return handle_; }
     void* GetHandle() const { return handle_; }