Bläddra i källkod

Removed PortAudio from Direct3D9 build, as it is not used.
Fixed check in setting the scissor rectangle.

Lasse Öörni 14 år sedan
förälder
incheckning
7e00d6aa1d

+ 1 - 1
CMakeLists.txt

@@ -146,7 +146,6 @@ add_subdirectory (ThirdParty/Assimp)
 add_subdirectory (ThirdParty/FreeType)
 add_subdirectory (ThirdParty/FreeType)
 add_subdirectory (ThirdParty/kNet)
 add_subdirectory (ThirdParty/kNet)
 add_subdirectory (ThirdParty/ODE)
 add_subdirectory (ThirdParty/ODE)
-add_subdirectory (ThirdParty/PortAudio)
 add_subdirectory (ThirdParty/StanHull)
 add_subdirectory (ThirdParty/StanHull)
 add_subdirectory (ThirdParty/STB)
 add_subdirectory (ThirdParty/STB)
 add_subdirectory (ThirdParty/TinyXML)
 add_subdirectory (ThirdParty/TinyXML)
@@ -161,6 +160,7 @@ if (USE_OPENGL)
     add_subdirectory (SourceAssets/GLSLShaders)
     add_subdirectory (SourceAssets/GLSLShaders)
     add_subdirectory (ThirdParty/GLee)
     add_subdirectory (ThirdParty/GLee)
     add_subdirectory (ThirdParty/GLFW)
     add_subdirectory (ThirdParty/GLFW)
+    add_subdirectory (ThirdParty/PortAudio)
     add_subdirectory (Tools/GLShaderProcessor)
     add_subdirectory (Tools/GLShaderProcessor)
 else ()
 else ()
     add_subdirectory (SourceAssets/HLSLShaders)
     add_subdirectory (SourceAssets/HLSLShaders)

+ 1 - 1
Engine/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -1513,7 +1513,7 @@ void Graphics::SetScissorTest(bool enable, const Rect& rect, bool borderInclusiv
 {
 {
     // During some light rendering loops, a full rect is toggled on/off repeatedly.
     // During some light rendering loops, a full rect is toggled on/off repeatedly.
     // Disable scissor in that case to reduce state changes
     // Disable scissor in that case to reduce state changes
-    if (rect.min_.x_ <= 0.0f && rect.min_.y_ <= 0.0f && rect.max_.y_ >= 1.0f && rect.max_.y_ >= 1.0f)
+    if (rect.min_.x_ <= 0.0f && rect.min_.y_ <= 0.0f && rect.max_.x_ >= 1.0f && rect.max_.y_ >= 1.0f)
         enable = false;
         enable = false;
     
     
     // Check for illegal rect, disable in that case
     // Check for illegal rect, disable in that case

+ 2 - 2
Engine/Graphics/OpenGL/OGLGraphics.cpp

@@ -1521,9 +1521,9 @@ void Graphics::SetFillMode(FillMode mode)
 
 
 void Graphics::SetScissorTest(bool enable, const Rect& rect, bool borderInclusive)
 void Graphics::SetScissorTest(bool enable, const Rect& rect, bool borderInclusive)
 {
 {
-     // During some light rendering loops, a full rect is toggled on/off repeatedly.
+    // During some light rendering loops, a full rect is toggled on/off repeatedly.
     // Disable scissor in that case to reduce state changes
     // Disable scissor in that case to reduce state changes
-    if (rect.min_.x_ <= 0.0f && rect.min_.y_ <= 0.0f && rect.max_.y_ >= 1.0f && rect.max_.y_ >= 1.0f)
+    if (rect.min_.x_ <= 0.0f && rect.min_.y_ <= 0.0f && rect.max_.x_ >= 1.0f && rect.max_.y_ >= 1.0f)
         enable = false;
         enable = false;
     
     
     // Check for illegal rect, disable in that case
     // Check for illegal rect, disable in that case