Skip to content

Commit

Permalink
Merge pull request #338 from greenfire27/VersionUpdate3_3
Browse files Browse the repository at this point in the history 
Version update3 3
  • Loading branch information
@greenfire27
greenfire27 committed Apr 3, 2016
2 parents c47a198 + 0c8b73c commit 107b998
Show file tree
Hide file tree
Showing 9 changed files with 138 additions and 32 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png)
## Torque 2D 3.2
## Torque 2D 3.3

MIT Licensed Open Source version of Torque 2D from GarageGames. Maintained by the T2D Steering Committee and contributions from the community.

Expand All @@ -21,11 +21,11 @@ If you do not wish to compile the source code yourself, precompiled binary files

After downloading a copy of the source code, the following project files for each platform are provided for you and can be found in the `engine/compilers` folder.

* **Windows:** Visual Studio 2010, 2012, or 2013 (works with the free, "Express for Windows Desktop" version)
* **Windows:** Visual Studio 2013 or 2015 (works with the free, "Express for Windows Desktop" version)
* **OSX:** Xcode
* **Linux:** Make
* **iOS:** Xcode_iOS
* **Android:** Eclipse
* **Android:** Eclipse or Android Studio
* **Web:** Emscripten/Cmake

See the [wiki](https://github.com/GarageGames/Torque2D/wiki) for available guides on platform setup and development.
Expand Down
67 changes: 49 additions & 18 deletions engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

57 changes: 47 additions & 10 deletions engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
2AB4C1B016DE9F6700B02479 /* GroupedSceneController.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AB4C1AA16DE9F6700B02479 /* GroupedSceneController.cc */; };
2AB4C1B116DE9F6700B02479 /* PickingSceneController.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AB4C1AD16DE9F6700B02479 /* PickingSceneController.cc */; };
2AB97A2116B66BE50080F940 /* tamlCustom.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AB97A1F16B66BE50080F940 /* tamlCustom.cc */; };
2AC4404E16B0144500FC4091 /* ImageFont.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AC4404C16B0144500FC4091 /* ImageFont.cc */; };
2ACAFD471705CF340022601C /* tamlJSONParser.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2ACAFD451705CF340022601C /* tamlJSONParser.cc */; };
2ACF5A2C16E52D6A00F838D9 /* SpriteBatchQuery.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2ACF5A2916E52D6A00F838D9 /* SpriteBatchQuery.cc */; };
2AD42156170434C2005BB8AD /* tamlBinaryReader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2AD42152170434C2005BB8AD /* tamlBinaryReader.cc */; };
Expand Down Expand Up @@ -508,6 +507,11 @@
B350D1A3174F063200033EBB /* math_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D19F174F063200033EBB /* math_ScriptBinding.cc */; };
B350D1A5174F064000033EBB /* frameAllocator_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D1A4174F064000033EBB /* frameAllocator_ScriptBinding.cc */; };
B350D1BB174F06B700033EBB /* platformNetwork_ScriptBinding.cc in Sources */ = {isa = PBXBuildFile; fileRef = B350D1B8174F06B700033EBB /* platformNetwork_ScriptBinding.cc */; };
D000F9881CB0D44600C4D097 /* TextSprite.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9861CB0D44600C4D097 /* TextSprite.cc */; };
D000F98C1CB0D46D00C4D097 /* FontAsset.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F98A1CB0D46D00C4D097 /* FontAsset.cc */; };
D000F9941CB0D48600C4D097 /* BitmapFont.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F98E1CB0D48600C4D097 /* BitmapFont.cc */; };
D000F9951CB0D48600C4D097 /* BitmapFontCharacter.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9901CB0D48600C4D097 /* BitmapFontCharacter.cc */; };
D000F9981CB0D5DD00C4D097 /* audioDescriptions.cc in Sources */ = {isa = PBXBuildFile; fileRef = D000F9961CB0D5DD00C4D097 /* audioDescriptions.cc */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -588,9 +592,6 @@
2AB4C1AF16DE9F6700B02479 /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SceneController.h; path = controllers/core/SceneController.h; sourceTree = "<group>"; };
2AB97A1F16B66BE50080F940 /* tamlCustom.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tamlCustom.cc; sourceTree = "<group>"; };
2AB97A2016B66BE50080F940 /* tamlCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tamlCustom.h; sourceTree = "<group>"; };
2AC4404B16B0144500FC4091 /* ImageFont_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageFont_ScriptBinding.h; sourceTree = "<group>"; };
2AC4404C16B0144500FC4091 /* ImageFont.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageFont.cc; sourceTree = "<group>"; };
2AC4404D16B0144500FC4091 /* ImageFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageFont.h; sourceTree = "<group>"; };
2ACAFD451705CF340022601C /* tamlJSONParser.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tamlJSONParser.cc; path = json/tamlJSONParser.cc; sourceTree = "<group>"; };
2ACAFD461705CF340022601C /* tamlJSONParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tamlJSONParser.h; path = json/tamlJSONParser.h; sourceTree = "<group>"; };
2ACF5A2916E52D6A00F838D9 /* SpriteBatchQuery.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteBatchQuery.cc; sourceTree = "<group>"; };
Expand Down Expand Up @@ -784,7 +785,6 @@
867BAD5216AEC9050033868F /* SceneObject.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneObject.cc; sourceTree = "<group>"; };
867BAD5316AEC9050033868F /* SceneObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneObject.h; sourceTree = "<group>"; };
867BAD5416AEC9050033868F /* SceneObject_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneObject_ScriptBinding.h; sourceTree = "<group>"; };
867BAD5716AEC9050033868F /* SceneObjectMoveToEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneObjectMoveToEvent.h; sourceTree = "<group>"; };
867BAD5816AEC9050033868F /* SceneObjectRotateToEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneObjectRotateToEvent.h; sourceTree = "<group>"; };
867BAD5D16AEC9050033868F /* Scroller.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scroller.cc; sourceTree = "<group>"; };
867BAD5E16AEC9050033868F /* Scroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scroller.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1584,6 +1584,20 @@
B350D1C2174F06DE00033EBB /* simSet_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = simSet_ScriptBinding.h; sourceTree = "<group>"; };
B350D1C3174F06ED00033EBB /* stringBuffer_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringBuffer_ScriptBinding.h; sourceTree = "<group>"; };
B350D1C4174F06ED00033EBB /* stringUnit_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringUnit_ScriptBinding.h; sourceTree = "<group>"; };
D000F9851CB0D44600C4D097 /* TextSprite_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSprite_ScriptBinding.h; sourceTree = "<group>"; };
D000F9861CB0D44600C4D097 /* TextSprite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSprite.cc; sourceTree = "<group>"; };
D000F9871CB0D44600C4D097 /* TextSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSprite.h; sourceTree = "<group>"; };
D000F9891CB0D46D00C4D097 /* FontAsset_ScriptBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontAsset_ScriptBinding.h; sourceTree = "<group>"; };
D000F98A1CB0D46D00C4D097 /* FontAsset.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontAsset.cc; sourceTree = "<group>"; };
D000F98B1CB0D46D00C4D097 /* FontAsset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontAsset.h; sourceTree = "<group>"; };
D000F98E1CB0D48600C4D097 /* BitmapFont.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapFont.cc; sourceTree = "<group>"; };
D000F98F1CB0D48600C4D097 /* BitmapFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapFont.h; sourceTree = "<group>"; };
D000F9901CB0D48600C4D097 /* BitmapFontCharacter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapFontCharacter.cc; sourceTree = "<group>"; };
D000F9911CB0D48600C4D097 /* BitmapFontCharacter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapFontCharacter.h; sourceTree = "<group>"; };
D000F9921CB0D48600C4D097 /* BitmapFontCharacterInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapFontCharacterInfo.h; sourceTree = "<group>"; };
D000F9931CB0D48600C4D097 /* BitmapFontLineInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapFontLineInfo.h; sourceTree = "<group>"; };
D000F9961CB0D5DD00C4D097 /* audioDescriptions.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audioDescriptions.cc; sourceTree = "<group>"; };
D000F9971CB0D5DD00C4D097 /* audioDescriptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audioDescriptions.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1877,6 +1891,9 @@
867BACF916AEC9050033868F /* assets */ = {
isa = PBXGroup;
children = (
D000F9891CB0D46D00C4D097 /* FontAsset_ScriptBinding.h */,
D000F98A1CB0D46D00C4D097 /* FontAsset.cc */,
D000F98B1CB0D46D00C4D097 /* FontAsset.h */,
27908E1818A3FA9C002D41BD /* SkeletonAsset_ScriptBinding.h */,
27908E1918A3FA9C002D41BD /* SkeletonAsset.cc */,
27908E1A18A3FA9C002D41BD /* SkeletonAsset.h */,
Expand Down Expand Up @@ -1984,6 +2001,9 @@
867BAD4516AEC9050033868F /* sceneobject */ = {
isa = PBXGroup;
children = (
D000F9851CB0D44600C4D097 /* TextSprite_ScriptBinding.h */,
D000F9861CB0D44600C4D097 /* TextSprite.cc */,
D000F9871CB0D44600C4D097 /* TextSprite.h */,
27908E1C18A3FAB1002D41BD /* SkeletonObject_ScriptBinding.h */,
27908E1D18A3FAB1002D41BD /* SkeletonObject.cc */,
27908E1E18A3FAB1002D41BD /* SkeletonObject.h */,
Expand All @@ -1992,9 +2012,6 @@
2AA6866716D69968003CEF0A /* SceneObjectSet_ScriptBinding.h */,
2AA6866816D69968003CEF0A /* SceneObjectSet.cc */,
2AA6866916D69968003CEF0A /* SceneObjectSet.h */,
2AC4404B16B0144500FC4091 /* ImageFont_ScriptBinding.h */,
2AC4404C16B0144500FC4091 /* ImageFont.cc */,
2AC4404D16B0144500FC4091 /* ImageFont.h */,
867BAD4916AEC9050033868F /* CompositeSprite.cc */,
867BAD4A16AEC9050033868F /* CompositeSprite.h */,
867BAD4B16AEC9050033868F /* CompositeSprite_ScriptBinding.h */,
Expand All @@ -2004,7 +2021,6 @@
867BAD5216AEC9050033868F /* SceneObject.cc */,
867BAD5316AEC9050033868F /* SceneObject.h */,
867BAD5416AEC9050033868F /* SceneObject_ScriptBinding.h */,
867BAD5716AEC9050033868F /* SceneObjectMoveToEvent.h */,
867BAD5816AEC9050033868F /* SceneObjectRotateToEvent.h */,
867BAD5D16AEC9050033868F /* Scroller.cc */,
867BAD5E16AEC9050033868F /* Scroller.h */,
Expand Down Expand Up @@ -2071,6 +2087,8 @@
867BAD8916AEC9050033868F /* audio */ = {
isa = PBXGroup;
children = (
D000F9961CB0D5DD00C4D097 /* audioDescriptions.cc */,
D000F9971CB0D5DD00C4D097 /* audioDescriptions.h */,
B350D17B174F053800033EBB /* audio_ScriptBinding.cc */,
867BAD8A16AEC9050033868F /* audio.cc */,
867BAD8B16AEC9050033868F /* audio.h */,
Expand Down Expand Up @@ -3220,6 +3238,7 @@
86A9A3BA16AEC786003F01E6 /* Torque2D */ = {
isa = PBXGroup;
children = (
D000F98D1CB0D48600C4D097 /* bitmapFont */,
867BACF816AEC9050033868F /* 2d */,
867BAD6916AEC9050033868F /* algorithm */,
867BAD7016AEC9050033868F /* assets */,
Expand Down Expand Up @@ -3272,6 +3291,20 @@
path = Torque2D;
sourceTree = "<group>";
};
D000F98D1CB0D48600C4D097 /* bitmapFont */ = {
isa = PBXGroup;
children = (
D000F98E1CB0D48600C4D097 /* BitmapFont.cc */,
D000F98F1CB0D48600C4D097 /* BitmapFont.h */,
D000F9901CB0D48600C4D097 /* BitmapFontCharacter.cc */,
D000F9911CB0D48600C4D097 /* BitmapFontCharacter.h */,
D000F9921CB0D48600C4D097 /* BitmapFontCharacterInfo.h */,
D000F9931CB0D48600C4D097 /* BitmapFontLineInfo.h */,
);
name = bitmapFont;
path = ../../../source/bitmapFont;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -3425,6 +3458,7 @@
867BB00B16AEC9050033868F /* assetQuery.cc in Sources */,
867BB00D16AEC9050033868F /* assetTagsManifest.cc in Sources */,
867BB00E16AEC9050033868F /* audio.cc in Sources */,
D000F9981CB0D5DD00C4D097 /* audioDescriptions.cc in Sources */,
27908E5418A3FAE1002D41BD /* AttachmentLoader.c in Sources */,
867BB00F16AEC9050033868F /* AudioAsset.cc in Sources */,
867BB01016AEC9050033868F /* audioBuffer.cc in Sources */,
Expand Down Expand Up @@ -3530,6 +3564,7 @@
867BB07D16AEC9050033868F /* guiCanvas.cc in Sources */,
867BB07F16AEC9050033868F /* guiConsole.cc in Sources */,
867BB08016AEC9050033868F /* guiConsoleEditCtrl.cc in Sources */,
D000F9951CB0D48600C4D097 /* BitmapFontCharacter.cc in Sources */,
867BB08116AEC9050033868F /* guiConsoleTextCtrl.cc in Sources */,
867BB08216AEC9050033868F /* guiControl.cc in Sources */,
867BB08316AEC9050033868F /* guiDefaultControlRender.cc in Sources */,
Expand Down Expand Up @@ -3572,6 +3607,7 @@
867BB0A816AEC9050033868F /* centralDir.cc in Sources */,
27908E5118A3FAE1002D41BD /* Atlas.c in Sources */,
867BB0A916AEC9050033868F /* compressor.cc in Sources */,
D000F98C1CB0D46D00C4D097 /* FontAsset.cc in Sources */,
867BB0AA16AEC9050033868F /* deflate.cc in Sources */,
867BB0AB16AEC9050033868F /* extraField.cc in Sources */,
867BB0AC16AEC9050033868F /* fileHeader.cc in Sources */,
Expand Down Expand Up @@ -3725,6 +3761,7 @@
867BB21D16AECA070033868F /* pngread.c in Sources */,
867BB21E16AECA070033868F /* pngrio.c in Sources */,
867BB21F16AECA070033868F /* pngrtran.c in Sources */,
D000F9881CB0D44600C4D097 /* TextSprite.cc in Sources */,
867BB22016AECA070033868F /* pngrutil.c in Sources */,
867BB22116AECA070033868F /* pngset.c in Sources */,
867BB22216AECA070033868F /* pngtrans.c in Sources */,
Expand Down Expand Up @@ -3758,6 +3795,7 @@
27908E4F18A3FAE1002D41BD /* AnimationState.c in Sources */,
867BB26B16AECA110033868F /* jddctmgr.c in Sources */,
867BB26C16AECA110033868F /* jdhuff.c in Sources */,
D000F9941CB0D48600C4D097 /* BitmapFont.cc in Sources */,
867BB26D16AECA110033868F /* jdinput.c in Sources */,
867BB26E16AECA110033868F /* jdmainct.c in Sources */,
867BB26F16AECA110033868F /* jdmarker.c in Sources */,
Expand All @@ -3781,7 +3819,6 @@
867BB28116AECA110033868F /* jquant2.c in Sources */,
867BB28216AECA110033868F /* jutils.c in Sources */,
867BB44416AED2850033868F /* iOSGL2ES.mm in Sources */,
2AC4404E16B0144500FC4091 /* ImageFont.cc in Sources */,
86555D3716B2C2B400881446 /* T2DAppDelegate.mm in Sources */,
86555D3816B2C2B400881446 /* T2DView.mm in Sources */,
86555D3916B2C2B400881446 /* T2DViewController.mm in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion engine/source/audio/audioDescriptions.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _AUDIODESCRIPTION_H_
#include "audio\audioDescriptions.h"
#include "audio/audioDescriptions.h"
#endif

#include "audio/audio.h"
Expand Down
2 changes: 2 additions & 0 deletions engine/source/platformOSX/osxOpenGLDevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ class osxOpenGLDevice : public DisplayDevice

bool setGammaCorrection(F32 g);

bool getVerticalSync();

bool setVerticalSync( bool sync );

};
Expand Down
14 changes: 14 additions & 0 deletions engine/source/platformOSX/osxOpenGLDevice.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,20 @@

//-----------------------------------------------------------------------------

bool osxOpenGLDevice::getVerticalSync()
{
if (!gGLState.suppSwapInterval)
{
return false;
}

//Note that this returns the number of frames between Swaps.
//The function returns 0 / false if SwapInterval has not been specified.
return getVerticalSync();
}

//-----------------------------------------------------------------------------

bool osxOpenGLDevice::setVerticalSync( bool sync )
{
if ([[platState torqueView] contextInitialized])
Expand Down
15 changes: 15 additions & 0 deletions engine/source/platformOSX/osxTorqueView.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,21 @@ - (void)flushBuffer
[_openGLContext flushBuffer];
}

//-----------------------------------------------------------------------------
- (int)getVerticalSync
{
if (_openGLContext != nil)
{
GLint swapInterval = 0;
[_openGLContext getValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
return swapInterval;
}
else
{
return 0;
}
}

//-----------------------------------------------------------------------------
- (void)setVerticalSync:(bool)sync
{
Expand Down
1 change: 1 addition & 0 deletions engine/source/platformiOS/iOSOGLVideo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class OpenGLDevice : public DisplayDevice
const char* getDriverInfo();
bool getGammaCorrection(F32 &g);
bool setGammaCorrection(F32 g);
bool getVerticalSync( );
bool setVerticalSync( bool on );
};

Expand Down
6 changes: 6 additions & 0 deletions engine/source/platformiOS/iOSOGLVideo.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ void initDummyAgl(void)
return true;
}

//------------------------------------------------------------------------------
bool OpenGLDevice::getVerticalSync()
{
return true;
}

//------------------------------------------------------------------------------
bool OpenGLDevice::setVerticalSync(bool on)
{
Expand Down

0 comments on commit 107b998

Please sign in to comment.