fix for windows 64

NickHardeman · Mar 23, 2017 · 243027b · 243027b
1 parent fff5ef0
commit 243027b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/GizmoExample/src/ofApp.cpp b/GizmoExample/src/ofApp.cpp
@@ -25,7 +25,7 @@ void ofApp::setup(){
             colors[j] = tcolor;
         }
     }
-    
+	
     camera.disableMouseInput();
     camera.setDistance( 14 );
     camera.setPosition( 0, 1, -14 );
@@ -67,10 +67,10 @@ void ofApp::draw() {
         boxes[i].draw();
     }
     light.disable();
-    ofDisableLighting();
-
+	ofDisableLighting();
+
+	// gizmo draw() disables depth test and lighting //
     gizmo.draw( camera );
-
     camera.end();
     ofDisableDepthTest();
 

diff --git a/libs/LibGizmo/ZBaseMaths.inl b/libs/LibGizmo/ZBaseMaths.inl
@@ -1244,7 +1244,7 @@ inline void tmatrix::Identity()
 		0,0,1,0,
 		0,0,0,1);
 }
-#ifdef WIN32
+#if defined(__WIN32__)
 inline void SSE_MatrixF_x_MatrixF(const float *matA, const float *matB, float *result)
 {
 	__asm

diff --git a/src/ofxGizmo.cpp b/src/ofxGizmo.cpp
@@ -94,6 +94,8 @@ void ofxGizmo::draw( ofCamera &aCam ) {
             gizmoScale->SetCameraMatrix( aCam.getModelViewMatrix().getPtr(), aCam.getProjectionMatrix().getPtr() );
 
             if(bNodeSet) {
+				ofDisableDepthTest();
+				ofDisableLighting();
                 gizmo->Draw();
             }
         } ofPopStyle();