Changeset 11251

Timestamp:

Oct 31, 2016, 11:22:34 AM (7 years ago)

Author:

ahedges

Message:

comment out some carbon stuff and add tolua++

Location:

code/branches/mac_HS16/src/external

Files:

• ois/mac/MacInputManager.cpp (modified) (1 diff)
• ois/mac/MacKeyboard.cpp (modified) (1 diff)
• ois/mac/MacMouse.cpp (modified) (2 diffs)
• tolua/CMakeLists.txt (modified) (1 diff)
• tolua/tolua++.h (added)

code/branches/mac_HS16/src/external/ois/mac/MacInputManager.cpp

@@ -92 +92 @@
                 // else get the main active window.. user might not have access to it through some
                 // graphics libraries, if that fails then try at the application level.
-                mWindow = ActiveNonFloatingWindow();
-                if(mWindow == NULL)
-                {
+//              mWindow = ActiveNonFloatingWindow();
+//              if(mWindow == NULL)
+//              {
                         mEventTargetRef = GetApplicationEventTarget();
-                }
-                else
-                {
-                        //mEventTargetRef = GetWindowEventTarget(mWindow);
-                        mEventTargetRef = GetApplicationEventTarget();
-                }
+//              }
+//              else
+//              {
+//                      //mEventTargetRef = GetWindowEventTarget(mWindow);
+//                      mEventTargetRef = GetApplicationEventTarget();
+//              }
         }
         

code/branches/mac_HS16/src/external/ois/mac/MacKeyboard.cpp

@@ -203 +203 @@
                 //get string size
                 UInt32 stringsize;
-                status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
+        status = 0;//GetEventParameter(theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
                 
                 if(stringsize > 0)

code/branches/mac_HS16/src/external/ois/mac/MacMouse.cpp

@@ -71 +71 @@
         {
                 Rect clipRect = {0.0f, 0.0f, 0.0f, 0.0f};
-                GetWindowBounds(win, kWindowContentRgn, &clipRect);
+//              GetWindowBounds(win, kWindowContentRgn, &clipRect);
                 
                 CGPoint warpPoint;
@@ -281 +281 @@
                                 {
                                         Rect clipRect = {0.0f, 0.0f, 0.0f, 0.0f};
-                                        GetWindowBounds(win, kWindowContentRgn, &clipRect);
-                                        
+//                                      GetWindowBounds(win, kWindowContentRgn, &clipRect);
+
                                         CGPoint warpPoint;
                                         warpPoint.x = ((clipRect.right - clipRect.left) / 2) + clipRect.left;

code/branches/mac_HS16/src/external/tolua/CMakeLists.txt

@@ -35 +35 @@
 SET(TOLUA_PARSER_DEPENDENCIES
   toluaapp_orxonox
+  ${CMAKE_CURRENT_SOURCE_DIR}/tolua++.h
   ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua