Commit 4eda4c8e authored by bitplane's avatar bitplane

Update mac project, fixed some indentation

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2239 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b5605d2b
...@@ -91,7 +91,7 @@ namespace irr ...@@ -91,7 +91,7 @@ namespace irr
KEY_KEY_Z = 0x5A, // Z key KEY_KEY_Z = 0x5A, // Z key
KEY_LWIN = 0x5B, // Left Windows key (Microsoft Natural keyboard) KEY_LWIN = 0x5B, // Left Windows key (Microsoft Natural keyboard)
KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard)
KEY_APPS = 0x5D, //Applications key (Natural keyboard) KEY_APPS = 0x5D, // Applications key (Natural keyboard)
KEY_SLEEP = 0x5F, // Computer Sleep key KEY_SLEEP = 0x5F, // Computer Sleep key
KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key
KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key
......
...@@ -5,5 +5,5 @@ void main (void) ...@@ -5,5 +5,5 @@ void main (void)
{ {
vec4 col = texture2D(myTexture, vec2(gl_TexCoord[0])); vec4 col = texture2D(myTexture, vec2(gl_TexCoord[0]));
col *= gl_Color; col *= gl_Color;
gl_FragColor = col * 4.0; gl_FragColor = col * 4.0;
} }
...@@ -912,7 +912,8 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed ...@@ -912,7 +912,8 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed
c = [str characterAtIndex:0]; c = [str characterAtIndex:0];
iter = KeyCodes.find(c); iter = KeyCodes.find(c);
if (iter != KeyCodes.end()) mkey = (*iter).second; if (iter != KeyCodes.end())
mkey = (*iter).second;
else else
{ {
// workaround for period character // workaround for period character
...@@ -945,7 +946,7 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed ...@@ -945,7 +946,7 @@ void CIrrDeviceMacOSX::postKeyEvent(void *event,irr::SEvent &ievent,bool pressed
ievent.KeyInput.PressedDown = pressed; ievent.KeyInput.PressedDown = pressed;
ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0; ievent.KeyInput.Shift = ([(NSEvent *)event modifierFlags] & NSShiftKeyMask) != 0;
ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0; ievent.KeyInput.Control = ([(NSEvent *)event modifierFlags] & NSControlKeyMask) != 0;
ievent.KeyInput.Char = (irr::EKEY_CODE)mchar; ievent.KeyInput.Char = mchar;
if (skipCommand) if (skipCommand)
ievent.KeyInput.Control = true; ievent.KeyInput.Control = true;
......
...@@ -227,6 +227,8 @@ ...@@ -227,6 +227,8 @@
3484C4EF0F48D3A100C81F60 /* CGUITreeView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */; }; 3484C4EF0F48D3A100C81F60 /* CGUITreeView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */; };
3484C4FD0F48D4CB00C81F60 /* CMemoryFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */; }; 3484C4FD0F48D4CB00C81F60 /* CMemoryFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */; };
3484C4FE0F48D4CB00C81F60 /* CMemoryFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */; }; 3484C4FE0F48D4CB00C81F60 /* CMemoryFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */; };
34EC243C0F59272E0037BC3A /* CIrrDeviceConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */; };
34EC243D0F59272E0037BC3A /* CIrrDeviceConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34EC243B0F59272E0037BC3A /* CIrrDeviceConsole.cpp */; };
4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */; }; 4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */; };
4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */; }; 4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */; };
4C53E2500A48504D0014E966 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0054770A48470500C844C2 /* main.cpp */; }; 4C53E2500A48504D0014E966 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0054770A48470500C844C2 /* main.cpp */; };
...@@ -969,6 +971,8 @@ ...@@ -969,6 +971,8 @@
3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CGUITreeView.cpp; sourceTree = "<group>"; }; 3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CGUITreeView.cpp; sourceTree = "<group>"; };
3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMemoryFile.h; sourceTree = "<group>"; }; 3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMemoryFile.h; sourceTree = "<group>"; };
3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CMemoryFile.cpp; sourceTree = "<group>"; }; 3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CMemoryFile.cpp; sourceTree = "<group>"; };
34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CIrrDeviceConsole.h; sourceTree = "<group>"; };
34EC243B0F59272E0037BC3A /* CIrrDeviceConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CIrrDeviceConsole.cpp; sourceTree = "<group>"; };
4C0054710A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = 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>"; }; 4C0054770A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
4C00547D0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; 4C00547D0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
...@@ -2087,6 +2091,8 @@ ...@@ -2087,6 +2091,8 @@
0910BA830D1F6CA600D46B04 /* irr */ = { 0910BA830D1F6CA600D46B04 /* irr */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */,
34EC243B0F59272E0037BC3A /* CIrrDeviceConsole.cpp */,
4C53DF660A484C230014E966 /* CIrrDeviceLinux.cpp */, 4C53DF660A484C230014E966 /* CIrrDeviceLinux.cpp */,
4C53DF670A484C230014E966 /* CIrrDeviceLinux.h */, 4C53DF670A484C230014E966 /* CIrrDeviceLinux.h */,
5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */, 5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */,
...@@ -3027,6 +3033,7 @@ ...@@ -3027,6 +3033,7 @@
3484C4E10F48D1B000C81F60 /* CGUIImageList.h in Headers */, 3484C4E10F48D1B000C81F60 /* CGUIImageList.h in Headers */,
3484C4EE0F48D3A100C81F60 /* CGUITreeView.h in Headers */, 3484C4EE0F48D3A100C81F60 /* CGUITreeView.h in Headers */,
3484C4FD0F48D4CB00C81F60 /* CMemoryFile.h in Headers */, 3484C4FD0F48D4CB00C81F60 /* CMemoryFile.h in Headers */,
34EC243C0F59272E0037BC3A /* CIrrDeviceConsole.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -4024,6 +4031,7 @@ ...@@ -4024,6 +4031,7 @@
3484C4E20F48D1B000C81F60 /* CGUIImageList.cpp in Sources */, 3484C4E20F48D1B000C81F60 /* CGUIImageList.cpp in Sources */,
3484C4EF0F48D3A100C81F60 /* CGUITreeView.cpp in Sources */, 3484C4EF0F48D3A100C81F60 /* CGUITreeView.cpp in Sources */,
3484C4FE0F48D4CB00C81F60 /* CMemoryFile.cpp in Sources */, 3484C4FE0F48D4CB00C81F60 /* CMemoryFile.cpp in Sources */,
34EC243D0F59272E0037BC3A /* CIrrDeviceConsole.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
......
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