Skip to content

D
deprecated-irrlicht-mac
Commit f0b392d9 authored by teella's avatar teella
Browse files
Options

minor fix for OSX optional joystick activation like Win and Linux 

added example 19.MouseAndJoystick to OSX project


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1719 dfc29bdd-3216-0410-991c-e03cc46cb475
parent cefc1978
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 64 deletions
source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
View file @ f0b392d9
......@@ -361,8 +361,6 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
CursorControl = new CCursorControl(CreationParams.WindowSize, this);
createDriver();
createGUIAndScene();
initialiseJoysticks();
}
CIrrDeviceMacOSX::~CIrrDeviceMacOSX()
......@@ -987,24 +985,24 @@ bool CIrrDeviceMacOSX::activateJoysticks(core::array<SJoystickInfo> & joystickIn
result = IOMasterPort (bootstrap_port, &masterPort);
if (kIOReturnSuccess != result) {
os::Printer::log("initialiseJoysticks IOMasterPort failed", ELL_ERROR);
return;
return false;
}
hidDictionaryRef = IOServiceMatching (kIOHIDDeviceKey);
if (!hidDictionaryRef) {
os::Printer::log("initialiseJoysticks IOServiceMatching failed", ELL_ERROR);
return;
return false;
}
result = IOServiceGetMatchingServices (masterPort, hidDictionaryRef, &hidIterator);
if (kIOReturnSuccess != result) {
os::Printer::log("initialiseJoysticks IOServiceGetMatchingServices failed", ELL_ERROR);
return;
return false;
}
//no joysticks just return
if (!hidIterator)
return;
return false;
while ((hidObject = IOIteratorNext (hidIterator)))
{
......@@ -1071,12 +1069,13 @@ bool CIrrDeviceMacOSX::activateJoysticks(core::array<SJoystickInfo> & joystickIn
SJoystickInfo returnInfo;
returnInfo.Axes = info.axes;
returnInfo.Hats = info.hats;
returnInfo.Buttons = info.Buttons;
//returnInfo.Hats = info.hats;
returnInfo.Buttons = info.buttons;
returnInfo.Name = info.joystickName;
returnInfo.PovHat = SJoystickInfo::POV_HAT_UNKNOWN;
joystickInfo.push_back(returnInfo);
}
} else
continue;
......
source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
View file @ f0b392d9
......@@ -13,6 +13,8 @@
buildPhases = (
);
dependencies = (
0946CCD90EC99D8C00D945A5 /* PBXTargetDependency */,
0946CCD60EC99D8200D945A5 /* PBXTargetDependency */,
09F649720D2CE2A1001E0599 /* PBXTargetDependency */,
09F649450D2CE100001E0599 /* PBXTargetDependency */,
09F649210D2CDFF0001E0599 /* PBXTargetDependency */,
......@@ -149,6 +151,14 @@
093973C10E0458B200E0C987 /* CSceneNodeAnimatorCameraFPS.h in Headers */ = {isa = PBXBuildFile; fileRef = 093973BD0E0458B200E0C987 /* CSceneNodeAnimatorCameraFPS.h */; };
093973C20E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 093973BE0E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.cpp */; };
093973C30E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.h in Headers */ = {isa = PBXBuildFile; fileRef = 093973BF0E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.h */; };
0946CCA70EC99BBE00D945A5 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E1650A484C2C0014E966 /* MainMenu.nib */; };
0946CCA80EC99BBE00D945A5 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
0946CCAC0EC99BBE00D945A5 /* libIrrlicht.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E24D0A4850120014E966 /* libIrrlicht.a */; };
0946CCAD0EC99BBE00D945A5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E26D0A4850D60014E966 /* Cocoa.framework */; };
0946CCAE0EC99BBE00D945A5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E26E0A4850D60014E966 /* OpenGL.framework */; };
0946CCAF0EC99BBE00D945A5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0925113D0D744ADE006784D9 /* Carbon.framework */; };
0946CCB00EC99BBE00D945A5 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0930CE550EC39F4500D63866 /* IOKit.framework */; };
0946CCCB0EC99C6E00D945A5 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0946CCCA0EC99C6E00D945A5 /* main.cpp */; };
096840470D0F1A2300333EFD /* CB3DMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968401E0D0F1A2300333EFD /* CB3DMeshFileLoader.cpp */; };
096840480D0F1A2300333EFD /* CB3DMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968401F0D0F1A2300333EFD /* CB3DMeshFileLoader.h */; };
096840490D0F1A2300333EFD /* CBoneSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840200D0F1A2300333EFD /* CBoneSceneNode.cpp */; };
......@@ -556,6 +566,27 @@
remoteGlobalIDString = D2AAC07D0554694100DB518D;
remoteInfo = MacOSX;
};
0946CCA50EC99BBE00D945A5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = D2AAC07D0554694100DB518D;
remoteInfo = MacOSX;
};
0946CCD50EC99D8200D945A5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 0946CCA30EC99BBE00D945A5 /* MouseAndJoystick */;
remoteInfo = MouseAndJoystick;
};
0946CCD80EC99D8C00D945A5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 09022C520EA0E97F00CD54EE /* GUIEditor */;
remoteInfo = GUIEditor;
};
09F648F60D2CDED9001E0599 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
......@@ -783,8 +814,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
09022C620EA0E97F00CD54EE /* GUIEditor_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GUIEditor_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
09022C640EA0E98000CD54EE /* DemoApp-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "DemoApp-Info copy.plist"; sourceTree = "<group>"; };
09022C620EA0E97F00CD54EE /* GUIEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GUIEditor.app; sourceTree = BUILT_PRODUCTS_DIR; };
09022C680EA0EA9D00CD54EE /* CGUIAttribute.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGUIAttribute.h; path = ../../../tools/GUIEditor/CGUIAttribute.h; sourceTree = SOURCE_ROOT; };
09022C690EA0EA9D00CD54EE /* CGUIAttributeEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CGUIAttributeEditor.cpp; path = ../../../tools/GUIEditor/CGUIAttributeEditor.cpp; sourceTree = SOURCE_ROOT; };
09022C6A0EA0EA9D00CD54EE /* CGUIAttributeEditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGUIAttributeEditor.h; path = ../../../tools/GUIEditor/CGUIAttributeEditor.h; sourceTree = SOURCE_ROOT; };
......@@ -807,7 +837,6 @@
09022C7B0EA0EA9D00CD54EE /* CMemoryReadWriteFile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CMemoryReadWriteFile.cpp; path = ../../../tools/GUIEditor/CMemoryReadWriteFile.cpp; sourceTree = SOURCE_ROOT; };
09022C7C0EA0EA9D00CD54EE /* CMemoryReadWriteFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMemoryReadWriteFile.h; path = ../../../tools/GUIEditor/CMemoryReadWriteFile.h; sourceTree = SOURCE_ROOT; };
09022C7D0EA0EA9D00CD54EE /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../../tools/GUIEditor/main.cpp; sourceTree = SOURCE_ROOT; };
09022CA10EA0EB9D00CD54EE /* DemoApp-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "DemoApp-Info copy.plist"; sourceTree = "<group>"; };
090FBC800D31085E0076D847 /* CVolumeLightSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CVolumeLightSceneNode.cpp; sourceTree = "<group>"; };
090FBC810D31085E0076D847 /* CVolumeLightSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CVolumeLightSceneNode.h; sourceTree = "<group>"; };
0910B9D90D1F5D4100D46B04 /* CBurningShader_Raster_Reference.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CBurningShader_Raster_Reference.cpp; sourceTree = "<group>"; };
......@@ -876,6 +905,8 @@
093973BD0E0458B200E0C987 /* CSceneNodeAnimatorCameraFPS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSceneNodeAnimatorCameraFPS.h; sourceTree = "<group>"; };
093973BE0E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSceneNodeAnimatorCameraMaya.cpp; sourceTree = "<group>"; };
093973BF0E0458B200E0C987 /* CSceneNodeAnimatorCameraMaya.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSceneNodeAnimatorCameraMaya.h; sourceTree = "<group>"; };
0946CCB40EC99BBE00D945A5 /* MouseAndJoystick.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MouseAndJoystick.app; sourceTree = BUILT_PRODUCTS_DIR; };
0946CCCA0EC99C6E00D945A5 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = 19.MouseAndJoystick/main.cpp; sourceTree = "<group>"; };
0968401E0D0F1A2300333EFD /* CB3DMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CB3DMeshFileLoader.cpp; sourceTree = "<group>"; };
0968401F0D0F1A2300333EFD /* CB3DMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CB3DMeshFileLoader.h; sourceTree = "<group>"; };
096840200D0F1A2300333EFD /* CBoneSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CBoneSceneNode.cpp; sourceTree = "<group>"; };
......@@ -918,10 +949,10 @@
096F8E3C0EA2EFBA00907EC5 /* COBJMeshWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = COBJMeshWriter.h; sourceTree = "<group>"; };
09C638700D4F1A69000B6A18 /* CLWOMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CLWOMeshFileLoader.cpp; sourceTree = "<group>"; };
09C638710D4F1A69000B6A18 /* CLWOMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CLWOMeshFileLoader.h; sourceTree = "<group>"; };
09F649030D2CDED9001E0599 /* HelloWorld_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F649030D2CDED9001E0599 /* HelloWorld.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F6492E0D2CE038001E0599 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = 15.LoadIrrFile/main.cpp; sourceTree = "<group>"; };
09F6493E0D2CE03E001E0599 /* LoadIrrFile_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LoadIrrFile_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F649650D2CE206001E0599 /* Quake3Shader_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Shader_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F6493E0D2CE03E001E0599 /* LoadIrrFile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LoadIrrFile.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F649650D2CE206001E0599 /* Quake3Shader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Shader.app; sourceTree = BUILT_PRODUCTS_DIR; };
09F649730D2CE2D0001E0599 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = 16.Quake3MapShader/main.cpp; sourceTree = "<group>"; };
4C0054710A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
4C0054770A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
......@@ -1246,7 +1277,7 @@
4C53E18D0A484C2C0014E966 /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
4C53E1920A484C2C0014E966 /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
4C53E24D0A4850120014E966 /* libIrrlicht.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIrrlicht.a; sourceTree = BUILT_PRODUCTS_DIR; };
4C53E2520A4850550014E966 /* Quake3Map_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Map_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4C53E2520A4850550014E966 /* Quake3Map.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Map.app; sourceTree = BUILT_PRODUCTS_DIR; };
4C53E26D0A4850D60014E966 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
4C53E26E0A4850D60014E966 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "DemoApp-Info.plist"; sourceTree = "<group>"; };
......@@ -1310,18 +1341,18 @@
4C53E76F0A485CD90014E966 /* wrrle.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = wrrle.c; sourceTree = "<group>"; };
4C53E7700A485CD90014E966 /* wrtarga.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = wrtarga.c; sourceTree = "<group>"; };
4C6DC9B60A48715A0017A6E5 /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; };
4CA25B980A485D9800B4E469 /* CustomSceneNode_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CustomSceneNode_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9A0A485D9800B4E469 /* MeshViewer_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MeshViewer_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9C0A485D9800B4E469 /* RenderToTexture_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RenderToTexture_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9E0A485D9800B4E469 /* UserInterface_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UserInterface_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA00A485D9800B4E469 /* PerPixelLighting_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerPixelLighting_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA20A485D9800B4E469 /* Demo_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA40A485D9800B4E469 /* Movement_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Movement_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA60A485D9800B4E469 /* Shaders_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Shaders_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA80A485D9800B4E469 /* SpecialFx_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SpecialFx_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAA0A485D9800B4E469 /* TerrainRendering_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TerrainRendering_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAC0A485D9800B4E469 /* 2DGraphics_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2DGraphics_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAE0A485D9800B4E469 /* Collision_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Collision_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B980A485D9800B4E469 /* CustomSceneNode.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CustomSceneNode.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9A0A485D9800B4E469 /* MeshViewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MeshViewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9C0A485D9800B4E469 /* RenderToTexture.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RenderToTexture.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25B9E0A485D9800B4E469 /* UserInterface.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UserInterface.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA00A485D9800B4E469 /* PerPixelLighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PerPixelLighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA20A485D9800B4E469 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA40A485D9800B4E469 /* Movement.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Movement.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA60A485D9800B4E469 /* Shaders.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Shaders.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BA80A485D9800B4E469 /* SpecialFx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SpecialFx.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAA0A485D9800B4E469 /* TerrainRendering.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TerrainRendering.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAC0A485D9800B4E469 /* 2DGraphics.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2DGraphics.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CA25BAE0A485D9800B4E469 /* Collision.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Collision.app; sourceTree = BUILT_PRODUCTS_DIR; };
4CC36B0D0A6B61DB0076C4B2 /* CSphereSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSphereSceneNode.cpp; sourceTree = "<group>"; };
4CC36B0E0A6B61DB0076C4B2 /* CSphereSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSphereSceneNode.h; sourceTree = "<group>"; };
4CFA7BDC0A88735900B03626 /* CImageLoaderBMP.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; path = CImageLoaderBMP.cpp; sourceTree = "<group>"; };
......@@ -1499,6 +1530,18 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
0946CCAB0EC99BBE00D945A5 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0946CCAC0EC99BBE00D945A5 /* libIrrlicht.a in Frameworks */,
0946CCAD0EC99BBE00D945A5 /* Cocoa.framework in Frameworks */,
0946CCAE0EC99BBE00D945A5 /* OpenGL.framework in Frameworks */,
0946CCAF0EC99BBE00D945A5 /* Carbon.framework in Frameworks */,
0946CCB00EC99BBE00D945A5 /* IOKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
09F648FC0D2CDED9001E0599 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
......@@ -2450,6 +2493,14 @@
name = Software;
sourceTree = "<group>";
};
0946CC980EC99B8B00D945A5 /* 19.MouseAndJoystick */ = {
isa = PBXGroup;
children = (
0946CCCA0EC99C6E00D945A5 /* main.cpp */,
);
name = 19.MouseAndJoystick;
sourceTree = "<group>";
};
09F6492D0D2CE017001E0599 /* 15.LoadIrrFile */ = {
isa = PBXGroup;
children = (
......@@ -2484,6 +2535,7 @@
4C0054B90A48470500C844C2 /* 13.RenderToTexture */,
09F6492D0D2CE017001E0599 /* 15.LoadIrrFile */,
09F649530D2CE1EB001E0599 /* 16.Quake3Shader */,
0946CC980EC99B8B00D945A5 /* 19.MouseAndJoystick */,
4C0054C40A48470500C844C2 /* Demo */,
);
name = examples;
......@@ -2722,8 +2774,6 @@
4C53E1650A484C2C0014E966 /* MainMenu.nib */,
4C53E1660A484C2C0014E966 /* OSXClipboard.h */,
4C53E1670A484C2C0014E966 /* OSXClipboard.mm */,
09022C640EA0E98000CD54EE /* DemoApp-Info copy.plist */,
09022CA10EA0EB9D00CD54EE /* DemoApp-Info copy.plist */,
);
path = MacOSX;
sourceTree = "<group>";
......@@ -2780,24 +2830,25 @@
4C53E24C0A484FED0014E966 /* Products */ = {
isa = PBXGroup;
children = (
09022C620EA0E97F00CD54EE /* GUIEditor_dbg.app */,
0946CCB40EC99BBE00D945A5 /* MouseAndJoystick.app */,
09022C620EA0E97F00CD54EE /* GUIEditor.app */,
4C53E24D0A4850120014E966 /* libIrrlicht.a */,
4C53E2520A4850550014E966 /* Quake3Map_dbg.app */,
4CA25B980A485D9800B4E469 /* CustomSceneNode_dbg.app */,
4CA25BA40A485D9800B4E469 /* Movement_dbg.app */,
4CA25B9E0A485D9800B4E469 /* UserInterface_dbg.app */,
4CA25BAC0A485D9800B4E469 /* 2DGraphics_dbg.app */,
4CA25BAE0A485D9800B4E469 /* Collision_dbg.app */,
4CA25BA80A485D9800B4E469 /* SpecialFx_dbg.app */,
4CA25B9A0A485D9800B4E469 /* MeshViewer_dbg.app */,
4CA25BA60A485D9800B4E469 /* Shaders_dbg.app */,
4CA25BA00A485D9800B4E469 /* PerPixelLighting_dbg.app */,
4CA25B9C0A485D9800B4E469 /* RenderToTexture_dbg.app */,
4CA25BAA0A485D9800B4E469 /* TerrainRendering_dbg.app */,
4CA25BA20A485D9800B4E469 /* Demo_dbg.app */,
09F6493E0D2CE03E001E0599 /* LoadIrrFile_dbg.app */,
09F649650D2CE206001E0599 /* Quake3Shader_dbg.app */,
09F649030D2CDED9001E0599 /* HelloWorld_dbg.app */,
4C53E2520A4850550014E966 /* Quake3Map.app */,
4CA25B980A485D9800B4E469 /* CustomSceneNode.app */,
4CA25BA40A485D9800B4E469 /* Movement.app */,
4CA25B9E0A485D9800B4E469 /* UserInterface.app */,
4CA25BAC0A485D9800B4E469 /* 2DGraphics.app */,
4CA25BAE0A485D9800B4E469 /* Collision.app */,
4CA25BA80A485D9800B4E469 /* SpecialFx.app */,
4CA25B9A0A485D9800B4E469 /* MeshViewer.app */,
4CA25BA60A485D9800B4E469 /* Shaders.app */,
4CA25BA00A485D9800B4E469 /* PerPixelLighting.app */,
4CA25B9C0A485D9800B4E469 /* RenderToTexture.app */,
4CA25BAA0A485D9800B4E469 /* TerrainRendering.app */,
4CA25BA20A485D9800B4E469 /* Demo.app */,
09F6493E0D2CE03E001E0599 /* LoadIrrFile.app */,
09F649650D2CE206001E0599 /* Quake3Shader.app */,
09F649030D2CDED9001E0599 /* HelloWorld.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -2975,7 +3026,25 @@
);
name = GUIEditor;
productName = DemoApp;
productReference = 09022C620EA0E97F00CD54EE /* GUIEditor_dbg.app */;
productReference = 09022C620EA0E97F00CD54EE /* GUIEditor.app */;
productType = "com.apple.product-type.application";
};
0946CCA30EC99BBE00D945A5 /* MouseAndJoystick */ = {
isa = PBXNativeTarget;
buildConfigurationList = 0946CCB10EC99BBE00D945A5 /* Build configuration list for PBXNativeTarget "MouseAndJoystick" */;
buildPhases = (
0946CCA60EC99BBE00D945A5 /* Resources */,
0946CCA90EC99BBE00D945A5 /* Sources */,
0946CCAB0EC99BBE00D945A5 /* Frameworks */,
);
buildRules = (
);
dependencies = (
0946CCA40EC99BBE00D945A5 /* PBXTargetDependency */,
);
name = MouseAndJoystick;
productName = DemoApp;
productReference = 0946CCB40EC99BBE00D945A5 /* MouseAndJoystick.app */;
productType = "com.apple.product-type.application";
};
09F648F40D2CDED9001E0599 /* HelloWorld */ = {
......@@ -2993,7 +3062,7 @@
);
name = HelloWorld;
productName = DemoApp;
productReference = 09F649030D2CDED9001E0599 /* HelloWorld_dbg.app */;
productReference = 09F649030D2CDED9001E0599 /* HelloWorld.app */;
productType = "com.apple.product-type.application";
};
09F6492F0D2CE03E001E0599 /* LoadIrrFile */ = {
......@@ -3011,7 +3080,7 @@
);
name = LoadIrrFile;
productName = DemoApp;
productReference = 09F6493E0D2CE03E001E0599 /* LoadIrrFile_dbg.app */;
productReference = 09F6493E0D2CE03E001E0599 /* LoadIrrFile.app */;
productType = "com.apple.product-type.application";
};
09F649560D2CE206001E0599 /* Quake3Shader */ = {
......@@ -3029,7 +3098,7 @@
);
name = Quake3Shader;
productName = DemoApp;
productReference = 09F649650D2CE206001E0599 /* Quake3Shader_dbg.app */;
productReference = 09F649650D2CE206001E0599 /* Quake3Shader.app */;
productType = "com.apple.product-type.application";
};
B81CFDFE097FD9F50057C06F /* 2DGraphics */ = {
......@@ -3047,7 +3116,7 @@
);
name = 2DGraphics;
productName = DemoApp;
productReference = 4CA25BAC0A485D9800B4E469 /* 2DGraphics_dbg.app */;
productReference = 4CA25BAC0A485D9800B4E469 /* 2DGraphics.app */;
productType = "com.apple.product-type.application";
};
B81CFE82097FDDE20057C06F /* Collision */ = {
......@@ -3065,7 +3134,7 @@
);
name = Collision;
productName = DemoApp;
productReference = 4CA25BAE0A485D9800B4E469 /* Collision_dbg.app */;
productReference = 4CA25BAE0A485D9800B4E469 /* Collision.app */;
productType = "com.apple.product-type.application";
};
B81CFEA4097FDE900057C06F /* PerPixelLightning */ = {
......@@ -3083,7 +3152,7 @@
);
name = PerPixelLightning;
productName = DemoApp;
productReference = 4CA25BA00A485D9800B4E469 /* PerPixelLighting_dbg.app */;
productReference = 4CA25BA00A485D9800B4E469 /* PerPixelLighting.app */;
productType = "com.apple.product-type.application";
};
B81CFEC2097FDF020057C06F /* TerrainRendering */ = {
......@@ -3101,7 +3170,7 @@
);
name = TerrainRendering;
productName = DemoApp;
productReference = 4CA25BAA0A485D9800B4E469 /* TerrainRendering_dbg.app */;
productReference = 4CA25BAA0A485D9800B4E469 /* TerrainRendering.app */;
productType = "com.apple.product-type.application";
};
B81CFEE8097FE05F0057C06F /* SpecialFx */ = {
......@@ -3119,7 +3188,7 @@
);
name = SpecialFx;
productName = DemoApp;
productReference = 4CA25BA80A485D9800B4E469 /* SpecialFx_dbg.app */;
productReference = 4CA25BA80A485D9800B4E469 /* SpecialFx.app */;
productType = "com.apple.product-type.application";
};
B81CFF07097FE13E0057C06F /* UserInterface */ = {
......@@ -3137,7 +3206,7 @@
);
name = UserInterface;
productName = DemoApp;
productReference = 4CA25B9E0A485D9800B4E469 /* UserInterface_dbg.app */;
productReference = 4CA25B9E0A485D9800B4E469 /* UserInterface.app */;
productType = "com.apple.product-type.application";
};
B81CFF1E097FE1E00057C06F /* CustomSceneNode */ = {
......@@ -3155,7 +3224,7 @@
);
name = CustomSceneNode;
productName = DemoApp;
productReference = 4CA25B980A485D9800B4E469 /* CustomSceneNode_dbg.app */;
productReference = 4CA25B980A485D9800B4E469 /* CustomSceneNode.app */;
productType = "com.apple.product-type.application";
};
B81CFF33097FE25F0057C06F /* Quake3Map */ = {
......@@ -3173,7 +3242,7 @@
);
name = Quake3Map;
productName = DemoApp;
productReference = 4C53E2520A4850550014E966 /* Quake3Map_dbg.app */;
productReference = 4C53E2520A4850550014E966 /* Quake3Map.app */;
productType = "com.apple.product-type.application";
};
B81CFF4A097FE3050057C06F /* Shaders */ = {
......@@ -3191,7 +3260,7 @@
);
name = Shaders;
productName = DemoApp;
productReference = 4CA25BA60A485D9800B4E469 /* Shaders_dbg.app */;
productReference = 4CA25BA60A485D9800B4E469 /* Shaders.app */;
productType = "com.apple.product-type.application";
};
B81CFF78097FE3DC0057C06F /* Movement */ = {
......@@ -3209,7 +3278,7 @@
);
name = Movement;
productName = DemoApp;
productReference = 4CA25BA40A485D9800B4E469 /* Movement_dbg.app */;
productReference = 4CA25BA40A485D9800B4E469 /* Movement.app */;
productType = "com.apple.product-type.application";
};
B81CFF91097FE45E0057C06F /* MeshViewer */ = {
......@@ -3227,7 +3296,7 @@
);
name = MeshViewer;
productName = DemoApp;
productReference = 4CA25B9A0A485D9800B4E469 /* MeshViewer_dbg.app */;
productReference = 4CA25B9A0A485D9800B4E469 /* MeshViewer.app */;
productType = "com.apple.product-type.application";
};
B81CFFAF097FE5F80057C06F /* RenderToTexture */ = {
......@@ -3245,7 +3314,7 @@
);
name = RenderToTexture;
productName = DemoApp;
productReference = 4CA25B9C0A485D9800B4E469 /* RenderToTexture_dbg.app */;
productReference = 4CA25B9C0A485D9800B4E469 /* RenderToTexture.app */;
productType = "com.apple.product-type.application";
};
B8DEF35C0950229200FDEA7E /* Demo */ = {
......@@ -3263,7 +3332,7 @@
);
name = Demo;
productName = DemoApp;
productReference = 4CA25BA20A485D9800B4E469 /* Demo_dbg.app */;
productReference = 4CA25BA20A485D9800B4E469 /* Demo.app */;
productType = "com.apple.product-type.application";
};
D2AAC07D0554694100DB518D /* libIrrlicht.a */ = {
......@@ -3313,6 +3382,7 @@
09F6492F0D2CE03E001E0599 /* LoadIrrFile */,
09F649560D2CE206001E0599 /* Quake3Shader */,
09022C520EA0E97F00CD54EE /* GUIEditor */,
0946CCA30EC99BBE00D945A5 /* MouseAndJoystick */,
);
};
/* End PBXProject section */
......@@ -3327,6 +3397,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
0946CCA60EC99BBE00D945A5 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0946CCA70EC99BBE00D945A5 /* MainMenu.nib in Resources */,
0946CCA80EC99BBE00D945A5 /* DemoApp-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
09F648F70D2CDED9001E0599 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -3489,6 +3568,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
0946CCA90EC99BBE00D945A5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0946CCCB0EC99C6E00D945A5 /* main.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
09F648FA0D2CDED9001E0599 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -3921,6 +4008,21 @@
target = D2AAC07D0554694100DB518D /* libIrrlicht.a */;
targetProxy = 09022C540EA0E97F00CD54EE /* PBXContainerItemProxy */;
};
0946CCA40EC99BBE00D945A5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D2AAC07D0554694100DB518D /* libIrrlicht.a */;
targetProxy = 0946CCA50EC99BBE00D945A5 /* PBXContainerItemProxy */;
};
0946CCD60EC99D8200D945A5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 0946CCA30EC99BBE00D945A5 /* MouseAndJoystick */;
targetProxy = 0946CCD50EC99D8200D945A5 /* PBXContainerItemProxy */;
};
0946CCD90EC99D8C00D945A5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 09022C520EA0E97F00CD54EE /* GUIEditor */;
targetProxy = 0946CCD80EC99D8C00D945A5 /* PBXContainerItemProxy */;
};
09F648F50D2CDED9001E0599 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D2AAC07D0554694100DB518D /* libIrrlicht.a */;
......@@ -4153,6 +4255,73 @@
};
name = Release;
};
0946CCB20EC99BBE00D945A5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
ppc,
i386,
);
COPY_PHASE_STRIP = NO;
DEPLOYMENT_LOCATION = YES;
DSTROOT = ../../../bin/MacOSX;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = MouseAndJoystick_dbg;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
0946CCB30EC99BBE00D945A5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
ppc,
i386,
);
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DSTROOT = ../../../bin/MacOSX;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
OTHER_LDFLAGS = (
"-framework",
Foundation,
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = MouseAndJoystick;
SEPARATE_STRIP = YES;
STRIP_INSTALLED_PRODUCT = YES;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
09F649010D2CDED9001E0599 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -5258,6 +5427,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
0946CCB10EC99BBE00D945A5 /* Build configuration list for PBXNativeTarget "MouseAndJoystick" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0946CCB20EC99BBE00D945A5 /* Debug */,
0946CCB30EC99BBE00D945A5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
09F649000D2CDED9001E0599 /* Build configuration list for PBXNativeTarget "HelloWorld" */ = {
isa = XCConfigurationList;
buildConfigurations = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment