dmuratshin 9 years ago
parent
commit
a624b73785

+ 77 - 73
oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj/project.pbxproj

@@ -159,7 +159,6 @@
 		049B57021871F21E00EF3C66 /* Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B563D1871F21E00EF3C66 /* Resources.h */; };
 		049B57031871F21E00EF3C66 /* ResStarlingAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B563E1871F21E00EF3C66 /* ResStarlingAtlas.cpp */; };
 		049B57041871F21E00EF3C66 /* ResStarlingAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B563F1871F21E00EF3C66 /* ResStarlingAtlas.h */; };
-		049B57061871F21E00EF3C66 /* RootActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B56411871F21E00EF3C66 /* RootActor.h */; };
 		049B57071871F21E00EF3C66 /* SlidingActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B56421871F21E00EF3C66 /* SlidingActor.cpp */; };
 		049B57081871F21E00EF3C66 /* SlidingActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B56431871F21E00EF3C66 /* SlidingActor.h */; };
 		049B57091871F21E00EF3C66 /* Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 049B56441871F21E00EF3C66 /* Sprite.cpp */; };
@@ -236,6 +235,8 @@
 		92F3F3491CA3BD7B00425D52 /* ThreadDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92F3F3461CA3BD7B00425D52 /* ThreadDispatcher.cpp */; };
 		92F3F34A1CA3BD7B00425D52 /* ThreadDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 92F3F3471CA3BD7B00425D52 /* ThreadDispatcher.h */; };
 		92F3F34B1CA3BD7B00425D52 /* ThreadMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 92F3F3481CA3BD7B00425D52 /* ThreadMessages.h */; };
+		AD977D971D56F26400C3C05E /* key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD977D951D56F26400C3C05E /* key.cpp */; };
+		AD977D981D56F26400C3C05E /* key.h in Headers */ = {isa = PBXBuildFile; fileRef = AD977D961D56F26400C3C05E /* key.h */; };
 		CEC2CFF61C47274C00450163 /* Material.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFEE1C47274C00450163 /* Material.cpp */; };
 		CEC2CFF71C47274C00450163 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2CFEF1C47274C00450163 /* Material.h */; };
 		CEC2CFF81C47274C00450163 /* STDMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFF01C47274C00450163 /* STDMaterial.cpp */; };
@@ -402,7 +403,6 @@
 		049B563D1871F21E00EF3C66 /* Resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resources.h; sourceTree = "<group>"; };
 		049B563E1871F21E00EF3C66 /* ResStarlingAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResStarlingAtlas.cpp; sourceTree = "<group>"; };
 		049B563F1871F21E00EF3C66 /* ResStarlingAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResStarlingAtlas.h; sourceTree = "<group>"; };
-		049B56411871F21E00EF3C66 /* RootActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RootActor.h; path = ../../../src/RootActor.h; sourceTree = "<group>"; };
 		049B56421871F21E00EF3C66 /* SlidingActor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SlidingActor.cpp; path = ../../../src/SlidingActor.cpp; sourceTree = "<group>"; };
 		049B56431871F21E00EF3C66 /* SlidingActor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SlidingActor.h; path = ../../../src/SlidingActor.h; sourceTree = "<group>"; };
 		049B56441871F21E00EF3C66 /* Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sprite.cpp; path = ../../../src/Sprite.cpp; sourceTree = "<group>"; };
@@ -480,6 +480,8 @@
 		92F3F3461CA3BD7B00425D52 /* ThreadDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadDispatcher.cpp; sourceTree = "<group>"; };
 		92F3F3471CA3BD7B00425D52 /* ThreadDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadDispatcher.h; sourceTree = "<group>"; };
 		92F3F3481CA3BD7B00425D52 /* ThreadMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadMessages.h; sourceTree = "<group>"; };
+		AD977D951D56F26400C3C05E /* key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = key.cpp; path = ../../../src/key.cpp; sourceTree = "<group>"; };
+		AD977D961D56F26400C3C05E /* key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = key.h; path = ../../../src/key.h; sourceTree = "<group>"; };
 		CEC2CFEE1C47274C00450163 /* Material.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Material.cpp; path = ../../../src/Material.cpp; sourceTree = "<group>"; };
 		CEC2CFEF1C47274C00450163 /* Material.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Material.h; path = ../../../src/Material.h; sourceTree = "<group>"; };
 		CEC2CFF01C47274C00450163 /* STDMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = STDMaterial.cpp; path = ../../../src/STDMaterial.cpp; sourceTree = "<group>"; };
@@ -520,109 +522,110 @@
 		049B55901871F21000EF3C66 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				9225533E1CAFA59F00333A1E /* TweenGlow.cpp */,
-				9225533F1CAFA59F00333A1E /* TweenGlow.h */,
-				92F3F33E1CA3BD5400425D52 /* PostProcess.cpp */,
-				92F3F33F1CA3BD5400425D52 /* PostProcess.h */,
-				92F3F3401CA3BD5400425D52 /* TweenOutline.cpp */,
-				92F3F3411CA3BD5400425D52 /* TweenOutline.h */,
-				929AF5721C88AF1200D276ED /* ThreadLoader.cpp */,
-				929AF5731C88AF1200D276ED /* ThreadLoader.h */,
-				9264E5C71B835AE50049F91F /* json */,
-				CEC2CFEE1C47274C00450163 /* Material.cpp */,
-				CEC2CFEF1C47274C00450163 /* Material.h */,
-				CEC2CFF01C47274C00450163 /* STDMaterial.cpp */,
-				CEC2CFF11C47274C00450163 /* STDMaterial.h */,
-				9240B40E1ADFBB3C005F9C5B /* TweenAnim.cpp */,
-				9240B40F1ADFBB3C005F9C5B /* TweenAnim.h */,
+				AD977D951D56F26400C3C05E /* key.cpp */,
+				AD977D961D56F26400C3C05E /* key.h */,
+				049B55911871F21D00EF3C66 /* Actor.cpp */,
+				049B55931871F21D00EF3C66 /* AnimationFrame.cpp */,
 				92CE26711A58ABDC003901D6 /* AsyncTask.cpp */,
-				92CE26721A58ABDC003901D6 /* AsyncTask.h */,
+				049B55951871F21D00EF3C66 /* blocking.cpp */,
+				049B55971871F21D00EF3C66 /* Box9Sprite.cpp */,
+				049B55991871F21D00EF3C66 /* Button.cpp */,
+				049B559B1871F21D00EF3C66 /* ClipRectActor.cpp */,
+				049B559D1871F21D00EF3C66 /* Clock.cpp */,
+				049B55A21871F21D00EF3C66 /* ColorRectSprite.cpp */,
+				049B55ED1871F21D00EF3C66 /* DebugActor.cpp */,
+				049B55FD1871F21D00EF3C66 /* Draggable.cpp */,
+				049B56001871F21D00EF3C66 /* EventDispatcher.cpp */,
+				049B56021871F21D00EF3C66 /* Font.cpp */,
 				92CE26731A58ABDC003901D6 /* HttpRequestTask.cpp */,
-				92CE26741A58ABDC003901D6 /* HttpRequestTask.h */,
-				92CE26751A58ABDC003901D6 /* KeyEvent.h */,
-				92CE26761A58ABDC003901D6 /* Property.h */,
-				92CE26771A58ABDC003901D6 /* WebImage.cpp */,
-				92CE26781A58ABDC003901D6 /* WebImage.h */,
-				923663511A47561500EB65B3 /* Serializable.cpp */,
-				923663521A47561500EB65B3 /* Serializable.h */,
-				923663531A47561500EB65B3 /* TouchEvent.h */,
-				923663541A47561500EB65B3 /* Tween.cpp */,
-				923663551A47561500EB65B3 /* Tween.h */,
-				923663561A47561500EB65B3 /* TweenQueue.cpp */,
-				923663571A47561500EB65B3 /* TweenQueue.h */,
-				CEC2CFF21C47274C00450163 /* TweenAlphaFade.cpp */,
-				CEC2CFF31C47274C00450163 /* TweenAlphaFade.h */,
+				049B56051871F21D00EF3C66 /* Input.cpp */,
+				04B3A71D18A6594D004C67E3 /* InputText.cpp */,
 				923A9E8D1A1FCA6600A6F08E /* MaskedRenderer.cpp */,
-				923A9E8E1A1FCA6600A6F08E /* MaskedRenderer.h */,
-				923A9E891A1FCA3500A6F08E /* STDRenderer.cpp */,
-				923A9E8A1A1FCA3500A6F08E /* STDRenderer.h */,
+				049B56071871F21D00EF3C66 /* MaskedSprite.cpp */,
+				CEC2CFEE1C47274C00450163 /* Material.cpp */,
+				049B56141871F21D00EF3C66 /* MemoryTexture.cpp */,
+				049B56211871F21D00EF3C66 /* PointerState.cpp */,
 				92214D5C19F149BC00A4459A /* Polygon.cpp */,
-				92214D5D19F149BC00A4459A /* Polygon.h */,
+				92F3F33E1CA3BD5400425D52 /* PostProcess.cpp */,
+				049B56231871F21D00EF3C66 /* ProgressBar.cpp */,
+				923663511A47561500EB65B3 /* Serializable.cpp */,
+				04670865192795E700D71824 /* Serialize.cpp */,
+				049B56421871F21E00EF3C66 /* SlidingActor.cpp */,
+				049B56441871F21E00EF3C66 /* Sprite.cpp */,
 				048AD0CF19B1FE96001963EF /* Stage.cpp */,
-				048AD0D019B1FE96001963EF /* Stage.h */,
+				CEC2CFF01C47274C00450163 /* STDMaterial.cpp */,
+				923A9E891A1FCA3500A6F08E /* STDRenderer.cpp */,
 				048AD0A2197D238D001963EF /* TextField.cpp */,
-				048AD0A3197D238D001963EF /* TextField.h */,
-				04670865192795E700D71824 /* Serialize.cpp */,
-				04670866192795E700D71824 /* Serialize.h */,
-				04B3A71D18A6594D004C67E3 /* InputText.cpp */,
-				04B3A71E18A6594D004C67E3 /* InputText.h */,
-				049B55911871F21D00EF3C66 /* Actor.cpp */,
+				929AF5721C88AF1200D276ED /* ThreadLoader.cpp */,
+				923663541A47561500EB65B3 /* Tween.cpp */,
+				CEC2CFF21C47274C00450163 /* TweenAlphaFade.cpp */,
+				9240B40E1ADFBB3C005F9C5B /* TweenAnim.cpp */,
+				9225533E1CAFA59F00333A1E /* TweenGlow.cpp */,
+				92F3F3401CA3BD5400425D52 /* TweenOutline.cpp */,
+				923663561A47561500EB65B3 /* TweenQueue.cpp */,
+				049B565C1871F21E00EF3C66 /* VisualStyle.cpp */,
+				92CE26771A58ABDC003901D6 /* WebImage.cpp */,
 				049B55921871F21D00EF3C66 /* Actor.h */,
-				049B55931871F21D00EF3C66 /* AnimationFrame.cpp */,
 				049B55941871F21D00EF3C66 /* AnimationFrame.h */,
-				049B55951871F21D00EF3C66 /* blocking.cpp */,
+				92CE26721A58ABDC003901D6 /* AsyncTask.h */,
 				049B55961871F21D00EF3C66 /* blocking.h */,
-				049B55971871F21D00EF3C66 /* Box9Sprite.cpp */,
 				049B55981871F21D00EF3C66 /* Box9Sprite.h */,
-				049B55991871F21D00EF3C66 /* Button.cpp */,
 				049B559A1871F21D00EF3C66 /* Button.h */,
-				049B559B1871F21D00EF3C66 /* ClipRectActor.cpp */,
 				049B559C1871F21D00EF3C66 /* ClipRectActor.h */,
-				049B559D1871F21D00EF3C66 /* Clock.cpp */,
 				049B559E1871F21D00EF3C66 /* Clock.h */,
-				049B559F1871F21D00EF3C66 /* closure */,
-				049B55A21871F21D00EF3C66 /* ColorRectSprite.cpp */,
 				049B55A31871F21D00EF3C66 /* ColorRectSprite.h */,
-				049B55A41871F21D00EF3C66 /* core */,
-				049B55ED1871F21D00EF3C66 /* DebugActor.cpp */,
 				049B55EE1871F21D00EF3C66 /* DebugActor.h */,
-				049B55EF1871F21D00EF3C66 /* dev_tools */,
-				049B55FD1871F21D00EF3C66 /* Draggable.cpp */,
 				049B55FE1871F21D00EF3C66 /* Draggable.h */,
 				049B55FF1871F21D00EF3C66 /* Event.h */,
-				049B56001871F21D00EF3C66 /* EventDispatcher.cpp */,
 				049B56011871F21D00EF3C66 /* EventDispatcher.h */,
-				049B56021871F21D00EF3C66 /* Font.cpp */,
 				049B56031871F21D00EF3C66 /* Font.h */,
+				92CE26741A58ABDC003901D6 /* HttpRequestTask.h */,
 				049B56041871F21D00EF3C66 /* initActor.h */,
-				049B56051871F21D00EF3C66 /* Input.cpp */,
 				049B56061871F21D00EF3C66 /* Input.h */,
-				049B56071871F21D00EF3C66 /* MaskedSprite.cpp */,
+				04B3A71E18A6594D004C67E3 /* InputText.h */,
+				92CE26751A58ABDC003901D6 /* KeyEvent.h */,
+				923A9E8E1A1FCA6600A6F08E /* MaskedRenderer.h */,
 				049B56081871F21D00EF3C66 /* MaskedSprite.h */,
-				049B56091871F21D00EF3C66 /* math */,
-				049B56141871F21D00EF3C66 /* MemoryTexture.cpp */,
+				CEC2CFEF1C47274C00450163 /* Material.h */,
 				049B56151871F21D00EF3C66 /* MemoryTexture.h */,
-				049B56161871F21D00EF3C66 /* minizip */,
 				049B561F1871F21D00EF3C66 /* oxygine_include.h */,
 				049B56201871F21D00EF3C66 /* oxygine-framework.h */,
-				049B56211871F21D00EF3C66 /* PointerState.cpp */,
 				049B56221871F21D00EF3C66 /* PointerState.h */,
-				049B56231871F21D00EF3C66 /* ProgressBar.cpp */,
+				92214D5D19F149BC00A4459A /* Polygon.h */,
+				92F3F33F1CA3BD5400425D52 /* PostProcess.h */,
 				049B56241871F21D00EF3C66 /* ProgressBar.h */,
-				049B56251871F21D00EF3C66 /* pugixml */,
+				92CE26761A58ABDC003901D6 /* Property.h */,
 				049B562B1871F21D00EF3C66 /* RenderState.h */,
-				049B562C1871F21D00EF3C66 /* res */,
-				049B56411871F21E00EF3C66 /* RootActor.h */,
-				049B56421871F21E00EF3C66 /* SlidingActor.cpp */,
+				923663521A47561500EB65B3 /* Serializable.h */,
+				04670866192795E700D71824 /* Serialize.h */,
 				049B56431871F21E00EF3C66 /* SlidingActor.h */,
-				049B56441871F21E00EF3C66 /* Sprite.cpp */,
 				049B56451871F21E00EF3C66 /* Sprite.h */,
-				049B56461871F21E00EF3C66 /* text_utils */,
+				048AD0D019B1FE96001963EF /* Stage.h */,
+				CEC2CFF11C47274C00450163 /* STDMaterial.h */,
+				923A9E8A1A1FCA3500A6F08E /* STDRenderer.h */,
+				048AD0A3197D238D001963EF /* TextField.h */,
 				049B564F1871F21E00EF3C66 /* TextStyle.h */,
+				929AF5731C88AF1200D276ED /* ThreadLoader.h */,
+				923663531A47561500EB65B3 /* TouchEvent.h */,
+				923663551A47561500EB65B3 /* Tween.h */,
+				CEC2CFF31C47274C00450163 /* TweenAlphaFade.h */,
+				9240B40F1ADFBB3C005F9C5B /* TweenAnim.h */,
+				9225533F1CAFA59F00333A1E /* TweenGlow.h */,
+				92F3F3411CA3BD5400425D52 /* TweenOutline.h */,
+				923663571A47561500EB65B3 /* TweenQueue.h */,
 				049B56521871F21E00EF3C66 /* UpdateState.h */,
-				049B56531871F21E00EF3C66 /* utils */,
-				049B565C1871F21E00EF3C66 /* VisualStyle.cpp */,
 				049B565D1871F21E00EF3C66 /* VisualStyle.h */,
+				92CE26781A58ABDC003901D6 /* WebImage.h */,
+				049B559F1871F21D00EF3C66 /* closure */,
+				049B55A41871F21D00EF3C66 /* core */,
+				049B55EF1871F21D00EF3C66 /* dev_tools */,
+				9264E5C71B835AE50049F91F /* json */,
+				049B56091871F21D00EF3C66 /* math */,
+				049B56161871F21D00EF3C66 /* minizip */,
+				049B56251871F21D00EF3C66 /* pugixml */,
+				049B562C1871F21D00EF3C66 /* res */,
+				049B56461871F21E00EF3C66 /* text_utils */,
+				049B56531871F21E00EF3C66 /* utils */,
 				049B565E1871F21E00EF3C66 /* winnie_alloc */,
 			);
 			name = src;
@@ -893,13 +896,13 @@
 				049B56FA1871F21E00EF3C66 /* ResBuffer.h in Headers */,
 				049B56AD1871F21E00EF3C66 /* STDFileSystem.h in Headers */,
 				922553411CAFA59F00333A1E /* TweenGlow.h in Headers */,
+				AD977D981D56F26400C3C05E /* key.h in Headers */,
 				049B56851871F21E00EF3C66 /* VertexDeclarationGL.h in Headers */,
 				049B56B91871F21E00EF3C66 /* VideoDriver.h in Headers */,
 				049B56C31871F21E00EF3C66 /* TreeInspector.h in Headers */,
 				049B57001871F21E00EF3C66 /* Resource.h in Headers */,
 				049B56EC1871F21E00EF3C66 /* PointerState.h in Headers */,
 				923A9E8C1A1FCA3500A6F08E /* STDRenderer.h in Headers */,
-				049B57061871F21E00EF3C66 /* RootActor.h in Headers */,
 				9236635A1A47561500EB65B3 /* TouchEvent.h in Headers */,
 				049B56B71871F21E00EF3C66 /* VertexDeclaration.h in Headers */,
 				9236635C1A47561500EB65B3 /* Tween.h in Headers */,
@@ -1146,6 +1149,7 @@
 				049B570F1871F21E00EF3C66 /* TextBuilder.cpp in Sources */,
 				049B56711871F21E00EF3C66 /* Clock.cpp in Sources */,
 				049B56BE1871F21E00EF3C66 /* DeveloperMenu.cpp in Sources */,
+				AD977D971D56F26400C3C05E /* key.cpp in Sources */,
 				048AD0A4197D238D001963EF /* TextField.cpp in Sources */,
 				048AD0D119B1FE96001963EF /* Stage.cpp in Sources */,
 				92F3F3441CA3BD5400425D52 /* TweenOutline.cpp in Sources */,