Permalink
Browse files

Merge pull request #339 from GarageGames/development

Torque 2D 3.3!
  • Loading branch information...
greenfire27 committed Apr 4, 2016
2 parents 8605814 + 107b998 commit 4571f96732b736c119549534bf93591cae013653
Showing with 5,116 additions and 1,277 deletions.
  1. +3 −3 README.md
  2. +2 −0 engine/compilers/Make/Makefile
  3. +9 −3 engine/compilers/Make/Torque2D
  4. +64 −0 engine/compilers/Make/ogg
  5. +89 −0 engine/compilers/Make/vorbis
  6. +0 −71 engine/compilers/Project1/Project1.vcxproj
  7. +0 −17 engine/compilers/Project1/Project1.vcxproj.filters
  8. +18 −8 engine/compilers/VisualStudio 2013/Torque 2D.vcxproj
  9. +48 −15 engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters
  10. +17 −8 engine/compilers/VisualStudio 2015/Torque 2D.vcxproj
  11. +45 −15 engine/compilers/VisualStudio 2015/Torque 2D.vcxproj.filters
  12. +49 −18 engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj
  13. +47 −14 engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj
  14. +9 −6 engine/compilers/android-studio/app/build.gradle
  15. +10 −4 engine/compilers/android-studio/app/src/main/jni/Android.mk
  16. +275 −0 engine/source/2d/assets/FontAsset.cc
  17. +93 −0 engine/source/2d/assets/FontAsset.h
  18. +47 −0 engine/source/2d/assets/FontAsset_ScriptBinding.h
  19. +30 −2 engine/source/2d/gui/SceneWindow.cc
  20. +9 −0 engine/source/2d/gui/SceneWindow.h
  21. +12 −0 engine/source/2d/gui/SceneWindow_ScriptBinding.h
  22. +3 −3 engine/source/2d/scene/ContactFilter.cc
  23. +1 −0 engine/source/2d/scene/Scene.cc
  24. +1 −0 engine/source/2d/scene/Scene.h
  25. +0 −400 engine/source/2d/sceneobject/ImageFont.cc
  26. +0 −133 engine/source/2d/sceneobject/ImageFont.h
  27. +0 −161 engine/source/2d/sceneobject/ImageFont_ScriptBinding.h
  28. +221 −88 engine/source/2d/sceneobject/SceneObject.cc
  29. +23 −6 engine/source/2d/sceneobject/SceneObject.h
  30. +171 −12 engine/source/2d/sceneobject/SceneObject_ScriptBinding.h
  31. +2 −2 engine/source/2d/sceneobject/ShapeVector.cc
  32. +915 −0 engine/source/2d/sceneobject/TextSprite.cc
  33. +241 −0 engine/source/2d/sceneobject/TextSprite.h
  34. +437 −0 engine/source/2d/sceneobject/TextSprite_ScriptBinding.h
  35. +40 −1 engine/source/audio/audio.cc
  36. +10 −1 engine/source/audio/audioBuffer.cc
  37. +2 −0 engine/source/audio/audioBuffer.h
  38. +57 −0 engine/source/audio/audioDescriptions.cc
  39. +72 −0 engine/source/audio/audioDescriptions.h
  40. +5 −0 engine/source/audio/audioStreamSourceFactory.cc
  41. +3 −3 engine/source/audio/audio_ScriptBinding.cc
  42. +1 −1 engine/source/audio/vorbisStreamSource.cc
  43. +2 −1 engine/source/audio/vorbisStreamSource.h
  44. +1 −1 engine/source/audio/wavStreamSource.cc
  45. +255 −0 engine/source/bitmapFont/BitmapFont.cc
  46. +75 −0 engine/source/bitmapFont/BitmapFont.h
  47. +46 −0 engine/source/bitmapFont/BitmapFontCharacter.cc
  48. +57 −0 engine/source/bitmapFont/BitmapFontCharacter.h
  49. +61 −0 engine/source/bitmapFont/BitmapFontCharacterInfo.h
  50. +51 −0 engine/source/bitmapFont/BitmapFontLineInfo.h
  51. +1 −1 engine/source/collection/nameTags_ScriptBinding.h
  52. +1 −1 engine/source/delegates/delegateSignal.h
  53. +1 −1 engine/source/gui/guiCanvas_ScriptBinding.h
  54. +1 −1 engine/source/persistence/taml/json/tamlJSONReader.cc
  55. +1 −0 engine/source/platform/platformAudio.h
  56. +9 −0 engine/source/platform/platformVideo.cc
  57. +3 −1 engine/source/platform/platformVideo.h
  58. +8 −0 engine/source/platform/platformVideo_ScriptBinding.h
  59. +0 −80 engine/source/platform/typesLinux.h
  60. +0 −80 engine/source/platform/typesX86UNIX.h
  61. +3 −3 engine/source/platformAndroid/AndroidEvents.h
  62. +6 −0 engine/source/platformAndroid/AndroidOGLVideo.cpp
  63. +1 −0 engine/source/platformAndroid/AndroidOGLVideo.h
  64. +1 −1 engine/source/platformAndroid/AndroidProcessControl.cpp
  65. +2 −0 engine/source/platformOSX/osxOpenGLDevice.h
  66. +14 −0 engine/source/platformOSX/osxOpenGLDevice.mm
  67. +15 −0 engine/source/platformOSX/osxTorqueView.mm
  68. +11 −0 engine/source/platformWin32/winOGLVideo.cc
  69. +1 −0 engine/source/platformWin32/winOGLVideo.h
  70. +0 −26 engine/source/platformWin32/winWindow.cc
  71. +13 −0 engine/source/platformX86UNIX/x86UNIXOGLVideo.cc
  72. +2 −1 engine/source/platformX86UNIX/x86UNIXOGLVideo.h
  73. +1 −0 engine/source/platformiOS/iOSOGLVideo.h
  74. +6 −0 engine/source/platformiOS/iOSOGLVideo.mm
  75. +1 −4 engine/source/sim/simObject.cc
  76. +1 −1 engine/source/string/stringBuffer.cc
  77. +0 −77 modules/ImageFontToy/1/main.cs
  78. +251 −0 modules/TextSpriteToy/1/main.cs
  79. +2 −2 modules/{ImageFontToy → TextSpriteToy}/1/module.taml
  80. +3 −0 modules/ToyAssets/1/assets/fonts/Arial.asset.taml
  81. +195 −0 modules/ToyAssets/1/assets/fonts/Arial.fnt
  82. BIN modules/ToyAssets/1/assets/fonts/Arial_0.png
  83. BIN modules/ToyAssets/1/assets/fonts/Arial_1.png
  84. +55 −0 modules/ToyAssets/1/assets/fonts/Bitmap Font Config.bmfc
  85. +3 −0 modules/ToyAssets/1/assets/fonts/Orator Bold.asset.taml
  86. +102 −0 modules/ToyAssets/1/assets/fonts/Orator Bold.fnt
  87. BIN modules/ToyAssets/1/assets/fonts/Orator Bold_0.png
  88. BIN modules/ToyAssets/1/assets/fonts/Orator Bold_1.png
  89. +3 −0 modules/ToyAssets/1/assets/fonts/Trajan Pro.asset.taml
  90. +770 −0 modules/ToyAssets/1/assets/fonts/Trajan Pro.fnt
  91. BIN modules/ToyAssets/1/assets/fonts/Trajan Pro_0.png
  92. BIN unicows.dll
@@ -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.

@@ -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.
@@ -19,6 +19,8 @@ clean:
-include x zlib
-include x lpng
-include x ljpeg
-include x vorbis
-include x ogg

release: $(LIB_TARGETS) $(SHARED_LIB_TARGETS) $(APP_TARGETS)
@echo Built libraries: $(LIB_TARGETS)
@@ -1,6 +1,7 @@
APPNAME := ../../../Torque2D

SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/2d/assets/FontAsset.cc \
../../source/2d/assets/ImageAsset.cc \
../../source/2d/assets/ParticleAsset.cc \
../../source/2d/assets/ParticleAssetEmitter.cc \
@@ -30,7 +31,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/2d/gui/guiSpriteCtrl.cc \
../../source/2d/gui/SceneWindow.cc \
../../source/2d/sceneobject/CompositeSprite.cc \
../../source/2d/sceneobject/ImageFont.cc \
../../source/2d/sceneobject/ParticlePlayer.cc \
../../source/2d/sceneobject/SceneObject.cc \
../../source/2d/sceneobject/SceneObjectList.cc \
@@ -39,6 +39,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/2d/sceneobject/ShapeVector.cc \
../../source/2d/sceneobject/SkeletonObject.cc \
../../source/2d/sceneobject/Sprite.cc \
../../source/2d/sceneobject/TextSprite.cc \
../../source/2d/sceneobject/Trigger.cc \
../../source/2d/scene/ContactFilter.cc \
../../source/2d/scene/DebugDraw.cc \
@@ -56,6 +57,8 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/assets/declaredAssets.cc \
../../source/assets/referencedAssets.cc \
../../source/audio/AudioAsset.cc \
../../source/bitmapFont/BitmapFont.cc \
../../source/bitmapFont/BitmapFontCharacter.cc \
../../source/Box2D/Collision/b2BroadPhase.cpp \
../../source/Box2D/Collision/b2CollideCircle.cpp \
../../source/Box2D/Collision/b2CollideEdge.cpp \
@@ -238,6 +241,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/persistence/tinyXML/tinyxml.cpp \
../../source/persistence/tinyXML/tinyxmlerror.cpp \
../../source/persistence/tinyXML/tinyxmlparser.cpp \
../../source/audio/vorbisStreamSource.cc \
../../source/audio/audio.cc \
../../source/audio/audioBuffer.cc \
../../source/audio/audioDataBlock.cc \
@@ -398,12 +402,12 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/gui/editor/guiInspector.cc \
../../source/gui/editor/guiInspectorTypes.cc \
../../source/gui/editor/guiMenuBar.cc \
../../source/gui/editor/guiSeparatorCtrl.cc
../../source/gui/editor/guiSeparatorCtrl.cc

LDFLAGS := -g -m32
LDLIBS := -lstdc++ -lm -ldl -lpthread -lrt -lX11 -lXft -lSDL -lopenal

CFLAGS := -MMD -I. -Wfatal-errors -Wunused -m32 -msse -march=i686 -pipe
CFLAGS := -std=gnu++11 -MMD -I. -Wfatal-errors -Wunused -m32 -msse -march=i686 -pipe

CFLAGS += -I/usr/include
CFLAGS += -I/usr/include/freetype2
@@ -413,6 +417,8 @@ CFLAGS += -I../../lib/ljpeg
CFLAGS += -I../../lib/zlib
CFLAGS += -I../../lib/lpng
CFLAGS += -I../../lib/freetype
CFLAGS += -I../../lib/libvorbis/include
CFLAGS += -I../../lib/libogg/include

CFLAGS += -DLINUX

@@ -0,0 +1,64 @@
# I release this sample under the MIT license: free for any use, provided
# you hold me harmless from any such use you make, and you retain my
# copyright on the actual sources.
# Copyright 2005 Jon Watte.

LIBNAME := ogg
SOURCES := \
../../lib/libogg/src/bitwise.c \
../../lib/libogg/src/framing.c \

LDFLAGS_ogg := -g -m32

CFLAGS_ogg := -MMD -I. -m32 -msse -mmmx -march=i686

CFLAGS_ogg += -I../../lib/libogg/include

CFLAGS_ogg += -DUNICODE
CFLAGS_ogg += -DLINUX

CFLAGS_DEBUG_ogg := $(CFLAGS_ogg) -ggdb
CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG
CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG_GUARD
CFLAGS_DEBUG_ogg += -DTORQUE_NET_STATS

CFLAGS_ogg += -O3

CC := gcc
LD := gcc

TARGET_ogg := lib/libogg.a
TARGET_ogg_DEBUG := lib/libogg_DEBUG.a

LIB_TARGETS += $(TARGET_ogg)
LIB_TARGETS_DEBUG += $(TARGET_ogg_DEBUG)

OBJS_ogg := $(patsubst ../../lib/libogg/%,Release/ogg/%.o,$(SOURCES))
OBJS_ogg_DEBUG := $(patsubst ../../lib/libogg/%,Debug/ogg/%.o,$(SOURCES))

# Deriving the variable name from the target name is the secret sauce
# of the build system.
#
$(TARGET_ogg): $(OBJS_ogg)
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ogg)

$(TARGET_ogg_DEBUG): $(OBJS_ogg_DEBUG)
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ogg_DEBUG)

Release/ogg/%.o: ../../lib/libogg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_ogg) $< -o $@

Debug/ogg/%.o: ../../lib/libogg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_DEBUG_ogg) $< -o $@

release_ogg: $(TARGET_ogg)
debug_ogg: $(TARGET_ogg_DEBUG)

.PHONY: debug_ogg release_ogg

DEPS += $(patsubst %.o,%.d,$(OBJS_ogg))
DEPS += $(patsubst %.o,%.d,$(OBJS_ogg_DEBUG))
@@ -0,0 +1,89 @@
# I release this sample under the MIT license: free for any use, provided
# you hold me harmless from any such use you make, and you retain my
# copyright on the actual sources.
# Copyright 2005 Jon Watte.

LIBNAME := vorbis
SOURCES := \
../../lib/libvorbis/analysis.c \
../../lib/libvorbis/barkmel.c \
../../lib/libvorbis/bitrate.c \
../../lib/libvorbis/block.c \
../../lib/libvorbis/codebook.c \
../../lib/libvorbis/envelope.c \
../../lib/libvorbis/floor0.c \
../../lib/libvorbis/floor1.c \
../../lib/libvorbis/info.c \
../../lib/libvorbis/lookup.c \
../../lib/libvorbis/lpc.c \
../../lib/libvorbis/lsp.c \
../../lib/libvorbis/mapping0.c \
../../lib/libvorbis/mdct.c \
../../lib/libvorbis/psy.c \
../../lib/libvorbis/registry.c \
../../lib/libvorbis/res0.c \
../../lib/libvorbis/sharedbook.c \
../../lib/libvorbis/smallft.c \
../../lib/libvorbis/synthesis.c \
../../lib/libvorbis/tone.c \
../../lib/libvorbis/vorbisenc.c \
../../lib/libvorbis/vorbisfile.c \
../../lib/libvorbis/window.c \

LDFLAGS_vorbis := -g -m32

CFLAGS_vorbis := -MMD -I. -m32 -msse -mmmx -march=i686

CFLAGS_vorbis += -I../../lib/libvorbis
CFLAGS_vorbis += -I../../lib/libvorbis/lib
CFLAGS_vorbis += -I../../lib/libvorbis/include
CFLAGS_vorbis += -I../../lib/libogg/include

CFLAGS_vorbis += -DUNICODE
CFLAGS_vorbis += -DLINUX

CFLAGS_DEBUG_vorbis := $(CFLAGS_vorbis) -ggdb
CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG
CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG_GUARD
CFLAGS_DEBUG_vorbis += -DTORQUE_NET_STATS

CFLAGS_vorbis += -O3

CC := gcc
LD := gcc

TARGET_vorbis := lib/libvorbis.a
TARGET_vorbis_DEBUG := lib/libvorbis_DEBUG.a

LIB_TARGETS += $(TARGET_vorbis)
LIB_TARGETS_DEBUG += $(TARGET_vorbis_DEBUG)

OBJS_vorbis := $(patsubst ../../lib/libvorbis/%,Release/vorbis/%.o,$(SOURCES))
OBJS_vorbis_DEBUG := $(patsubst ../../lib/libvorbis/%,Debug/vorbis/%.o,$(SOURCES))

# Deriving the variable name from the target name is the secret sauce
# of the build system.
#
$(TARGET_vorbis): $(OBJS_vorbis)
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_vorbis)

$(TARGET_vorbis_DEBUG): $(OBJS_vorbis_DEBUG)
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_vorbis_DEBUG)

Release/vorbis/%.o: ../../lib/libvorbis/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_vorbis) $< -o $@

Debug/vorbis/%.o: ../../lib/libvorbis/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_DEBUG_vorbis) $< -o $@

release_vorbis: $(TARGET_vorbis)
debug_vorbis: $(TARGET_vorbis_DEBUG)

.PHONY: debug_vorbis release_vorbis

DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis))
DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis_DEBUG))

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 4571f96

Please sign in to comment.