Sam Jaffe 1 рік тому
батько
коміт
63f74f30d2

+ 0 - 2
engine/engine.xcodeproj/project.pbxproj

@@ -26,7 +26,6 @@
 		CD8064FB22D69CAE00B9B4E4 /* game_dispatch_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD8064FA22D69CAE00B9B4E4 /* game_dispatch_test.cxx */; };
 		CD8064FD22D9456100B9B4E4 /* scene_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD8064FC22D9456100B9B4E4 /* scene_test.cxx */; };
 		CD8064FE22DA621200B9B4E4 /* libmath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8472251A9500023219A /* libmath.dylib */; };
-		CD8FBC8D2B743A8900CE38F1 /* game in Headers */ = {isa = PBXBuildFile; fileRef = CDA34D8422515C99008036A7 /* game */; settings = {ATTRIBUTES = (Public, ); }; };
 		CD9F1BA42B74428E0035EDF5 /* KeyBindingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD9F1BA32B74428E0035EDF5 /* KeyBindingView.mm */; };
 		CD9F1BAA2B7446A80035EDF5 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD9F1BA92B7446A80035EDF5 /* libjsoncpp.a */; };
 		CD9F1BB02B7447080035EDF5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD9F1BAF2B7447080035EDF5 /* Cocoa.framework */; };
@@ -290,7 +289,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD8FBC8D2B743A8900CE38F1 /* game in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 1 - 1
engine/include/game/osx/KeyBindingView.h

@@ -13,7 +13,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface KeyBindingView : NSView
-- (engine::game_dispatch*) engine;
+@property engine::game_dispatch* engine;
 @end
 
 NS_ASSUME_NONNULL_END

+ 5 - 5
engine/src/KeyBindingView.mm

@@ -23,11 +23,11 @@ static math::vec2 cast(NSPoint point) {
 NSEventModifierFlags previousModifierFlags = 0;
 
 -(void)mouseUp:(NSEvent *)event {
-  [self engine]->process_mouse_event(cast(NSEvent.mouseLocation), false);
+  self.engine->process_mouse_event(cast(NSEvent.mouseLocation), false);
 }
 
 -(void)mouseDown:(NSEvent *)event {
-  [self engine]->process_mouse_event(cast(NSEvent.mouseLocation), true);
+  self.engine->process_mouse_event(cast(NSEvent.mouseLocation), true);
 }
 
 -(void)flagsChanged:(NSEvent *)event {
@@ -41,17 +41,17 @@ NSEventModifierFlags previousModifierFlags = 0;
     if (is_on == (previousModifierFlags & flag)) {
       continue;
     }
-    [self engine]->process_key_event(key, is_on);
+    self.engine->process_key_event(key, is_on);
   }
   previousModifierFlags = event.modifierFlags;
 }
 
 -(void)keyUp:(NSEvent *)event {
-  [self engine]->process_key_event(event.keyCode, false);
+  self.engine->process_key_event(event.keyCode, false);
 }
 
 -(void)keyDown:(NSEvent *)event {
-  [self engine]->process_key_event(event.keyCode, true);
+  self.engine->process_key_event(event.keyCode, true);
 }
 
 @end

+ 0 - 2
util/gameutils.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 		CD62FD082291988F00376440 /* osx_env.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD62FD072291988F00376440 /* osx_env.mm */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; };
 		CD79A0F927246F4500CAFFC2 /* state_machine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD79A0F727246F4500CAFFC2 /* state_machine.cxx */; };
 		CD7E884822960F4800D877FE /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD7E884722960F4800D877FE /* AppKit.framework */; };
-		CD9F1BB92B744A370035EDF5 /* game in Headers */ = {isa = PBXBuildFile; fileRef = CD62FCFF2291953700376440 /* game */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -162,7 +161,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD9F1BB92B744A370035EDF5 /* game in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};