Skip to content

Commit 4571f96

Browse files
greenfire27greenfire27
committed
Merge pull request #339 from GarageGames/development
Torque 2D 3.3!
2 parents 8605814 + 107b998 commit 4571f96

File tree

92 files changed

+5116
-1277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5116
-1277
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png)
2-
## Torque 2D 3.2
2+
## Torque 2D 3.3
33

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

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

2222
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.
2323

24-
* **Windows:** Visual Studio 2010, 2012, or 2013 (works with the free, "Express for Windows Desktop" version)
24+
* **Windows:** Visual Studio 2013 or 2015 (works with the free, "Express for Windows Desktop" version)
2525
* **OSX:** Xcode
2626
* **Linux:** Make
2727
* **iOS:** Xcode_iOS
28-
* **Android:** Eclipse
28+
* **Android:** Eclipse or Android Studio
2929
* **Web:** Emscripten/Cmake
3030

3131
See the [wiki](https://github.com/GarageGames/Torque2D/wiki) for available guides on platform setup and development.

‎engine/compilers/Make/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ clean:
1919
-include x zlib
2020
-include x lpng
2121
-include x ljpeg
22+
-include x vorbis
23+
-include x ogg
2224

2325
release: $(LIB_TARGETS) $(SHARED_LIB_TARGETS) $(APP_TARGETS)
2426
@echo Built libraries: $(LIB_TARGETS)

‎engine/compilers/Make/Torque2D

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
APPNAME := ../../../Torque2D
22

33
SOURCES := ../../source/2d/assets/AnimationAsset.cc \
4+
../../source/2d/assets/FontAsset.cc \
45
../../source/2d/assets/ImageAsset.cc \
56
../../source/2d/assets/ParticleAsset.cc \
67
../../source/2d/assets/ParticleAssetEmitter.cc \
@@ -30,7 +31,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
3031
../../source/2d/gui/guiSpriteCtrl.cc \
3132
../../source/2d/gui/SceneWindow.cc \
3233
../../source/2d/sceneobject/CompositeSprite.cc \
33-
../../source/2d/sceneobject/ImageFont.cc \
3434
../../source/2d/sceneobject/ParticlePlayer.cc \
3535
../../source/2d/sceneobject/SceneObject.cc \
3636
../../source/2d/sceneobject/SceneObjectList.cc \
@@ -39,6 +39,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
3939
../../source/2d/sceneobject/ShapeVector.cc \
4040
../../source/2d/sceneobject/SkeletonObject.cc \
4141
../../source/2d/sceneobject/Sprite.cc \
42+
../../source/2d/sceneobject/TextSprite.cc \
4243
../../source/2d/sceneobject/Trigger.cc \
4344
../../source/2d/scene/ContactFilter.cc \
4445
../../source/2d/scene/DebugDraw.cc \
@@ -56,6 +57,8 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
5657
../../source/assets/declaredAssets.cc \
5758
../../source/assets/referencedAssets.cc \
5859
../../source/audio/AudioAsset.cc \
60+
../../source/bitmapFont/BitmapFont.cc \
61+
../../source/bitmapFont/BitmapFontCharacter.cc \
5962
../../source/Box2D/Collision/b2BroadPhase.cpp \
6063
../../source/Box2D/Collision/b2CollideCircle.cpp \
6164
../../source/Box2D/Collision/b2CollideEdge.cpp \
@@ -238,6 +241,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
238241
../../source/persistence/tinyXML/tinyxml.cpp \
239242
../../source/persistence/tinyXML/tinyxmlerror.cpp \
240243
../../source/persistence/tinyXML/tinyxmlparser.cpp \
244+
../../source/audio/vorbisStreamSource.cc \
241245
../../source/audio/audio.cc \
242246
../../source/audio/audioBuffer.cc \
243247
../../source/audio/audioDataBlock.cc \
@@ -398,12 +402,12 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
398402
../../source/gui/editor/guiInspector.cc \
399403
../../source/gui/editor/guiInspectorTypes.cc \
400404
../../source/gui/editor/guiMenuBar.cc \
401-
../../source/gui/editor/guiSeparatorCtrl.cc
405+
../../source/gui/editor/guiSeparatorCtrl.cc
402406

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

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

408412
CFLAGS += -I/usr/include
409413
CFLAGS += -I/usr/include/freetype2
@@ -413,6 +417,8 @@ CFLAGS += -I../../lib/ljpeg
413417
CFLAGS += -I../../lib/zlib
414418
CFLAGS += -I../../lib/lpng
415419
CFLAGS += -I../../lib/freetype
420+
CFLAGS += -I../../lib/libvorbis/include
421+
CFLAGS += -I../../lib/libogg/include
416422

417423
CFLAGS += -DLINUX
418424

‎engine/compilers/Make/ogg

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# I release this sample under the MIT license: free for any use, provided
2+
# you hold me harmless from any such use you make, and you retain my
3+
# copyright on the actual sources.
4+
# Copyright 2005 Jon Watte.
5+
6+
LIBNAME := ogg
7+
SOURCES := \
8+
../../lib/libogg/src/bitwise.c \
9+
../../lib/libogg/src/framing.c \
10+
11+
LDFLAGS_ogg := -g -m32
12+
13+
CFLAGS_ogg := -MMD -I. -m32 -msse -mmmx -march=i686
14+
15+
CFLAGS_ogg += -I../../lib/libogg/include
16+
17+
CFLAGS_ogg += -DUNICODE
18+
CFLAGS_ogg += -DLINUX
19+
20+
CFLAGS_DEBUG_ogg := $(CFLAGS_ogg) -ggdb
21+
CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG
22+
CFLAGS_DEBUG_ogg += -DTORQUE_DEBUG_GUARD
23+
CFLAGS_DEBUG_ogg += -DTORQUE_NET_STATS
24+
25+
CFLAGS_ogg += -O3
26+
27+
CC := gcc
28+
LD := gcc
29+
30+
TARGET_ogg := lib/libogg.a
31+
TARGET_ogg_DEBUG := lib/libogg_DEBUG.a
32+
33+
LIB_TARGETS += $(TARGET_ogg)
34+
LIB_TARGETS_DEBUG += $(TARGET_ogg_DEBUG)
35+
36+
OBJS_ogg := $(patsubst ../../lib/libogg/%,Release/ogg/%.o,$(SOURCES))
37+
OBJS_ogg_DEBUG := $(patsubst ../../lib/libogg/%,Debug/ogg/%.o,$(SOURCES))
38+
39+
# Deriving the variable name from the target name is the secret sauce
40+
# of the build system.
41+
#
42+
$(TARGET_ogg): $(OBJS_ogg)
43+
@mkdir -p $(dir $@)
44+
ar cr $@ $(OBJS_ogg)
45+
46+
$(TARGET_ogg_DEBUG): $(OBJS_ogg_DEBUG)
47+
@mkdir -p $(dir $@)
48+
ar cr $@ $(OBJS_ogg_DEBUG)
49+
50+
Release/ogg/%.o: ../../lib/libogg/%
51+
@mkdir -p $(dir $@)
52+
$(CC) -c $(CFLAGS_ogg) $< -o $@
53+
54+
Debug/ogg/%.o: ../../lib/libogg/%
55+
@mkdir -p $(dir $@)
56+
$(CC) -c $(CFLAGS_DEBUG_ogg) $< -o $@
57+
58+
release_ogg: $(TARGET_ogg)
59+
debug_ogg: $(TARGET_ogg_DEBUG)
60+
61+
.PHONY: debug_ogg release_ogg
62+
63+
DEPS += $(patsubst %.o,%.d,$(OBJS_ogg))
64+
DEPS += $(patsubst %.o,%.d,$(OBJS_ogg_DEBUG))

‎engine/compilers/Make/vorbis

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# I release this sample under the MIT license: free for any use, provided
2+
# you hold me harmless from any such use you make, and you retain my
3+
# copyright on the actual sources.
4+
# Copyright 2005 Jon Watte.
5+
6+
LIBNAME := vorbis
7+
SOURCES := \
8+
../../lib/libvorbis/analysis.c \
9+
../../lib/libvorbis/barkmel.c \
10+
../../lib/libvorbis/bitrate.c \
11+
../../lib/libvorbis/block.c \
12+
../../lib/libvorbis/codebook.c \
13+
../../lib/libvorbis/envelope.c \
14+
../../lib/libvorbis/floor0.c \
15+
../../lib/libvorbis/floor1.c \
16+
../../lib/libvorbis/info.c \
17+
../../lib/libvorbis/lookup.c \
18+
../../lib/libvorbis/lpc.c \
19+
../../lib/libvorbis/lsp.c \
20+
../../lib/libvorbis/mapping0.c \
21+
../../lib/libvorbis/mdct.c \
22+
../../lib/libvorbis/psy.c \
23+
../../lib/libvorbis/registry.c \
24+
../../lib/libvorbis/res0.c \
25+
../../lib/libvorbis/sharedbook.c \
26+
../../lib/libvorbis/smallft.c \
27+
../../lib/libvorbis/synthesis.c \
28+
../../lib/libvorbis/tone.c \
29+
../../lib/libvorbis/vorbisenc.c \
30+
../../lib/libvorbis/vorbisfile.c \
31+
../../lib/libvorbis/window.c \
32+
33+
LDFLAGS_vorbis := -g -m32
34+
35+
CFLAGS_vorbis := -MMD -I. -m32 -msse -mmmx -march=i686
36+
37+
CFLAGS_vorbis += -I../../lib/libvorbis
38+
CFLAGS_vorbis += -I../../lib/libvorbis/lib
39+
CFLAGS_vorbis += -I../../lib/libvorbis/include
40+
CFLAGS_vorbis += -I../../lib/libogg/include
41+
42+
CFLAGS_vorbis += -DUNICODE
43+
CFLAGS_vorbis += -DLINUX
44+
45+
CFLAGS_DEBUG_vorbis := $(CFLAGS_vorbis) -ggdb
46+
CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG
47+
CFLAGS_DEBUG_vorbis += -DTORQUE_DEBUG_GUARD
48+
CFLAGS_DEBUG_vorbis += -DTORQUE_NET_STATS
49+
50+
CFLAGS_vorbis += -O3
51+
52+
CC := gcc
53+
LD := gcc
54+
55+
TARGET_vorbis := lib/libvorbis.a
56+
TARGET_vorbis_DEBUG := lib/libvorbis_DEBUG.a
57+
58+
LIB_TARGETS += $(TARGET_vorbis)
59+
LIB_TARGETS_DEBUG += $(TARGET_vorbis_DEBUG)
60+
61+
OBJS_vorbis := $(patsubst ../../lib/libvorbis/%,Release/vorbis/%.o,$(SOURCES))
62+
OBJS_vorbis_DEBUG := $(patsubst ../../lib/libvorbis/%,Debug/vorbis/%.o,$(SOURCES))
63+
64+
# Deriving the variable name from the target name is the secret sauce
65+
# of the build system.
66+
#
67+
$(TARGET_vorbis): $(OBJS_vorbis)
68+
@mkdir -p $(dir $@)
69+
ar cr $@ $(OBJS_vorbis)
70+
71+
$(TARGET_vorbis_DEBUG): $(OBJS_vorbis_DEBUG)
72+
@mkdir -p $(dir $@)
73+
ar cr $@ $(OBJS_vorbis_DEBUG)
74+
75+
Release/vorbis/%.o: ../../lib/libvorbis/%
76+
@mkdir -p $(dir $@)
77+
$(CC) -c $(CFLAGS_vorbis) $< -o $@
78+
79+
Debug/vorbis/%.o: ../../lib/libvorbis/%
80+
@mkdir -p $(dir $@)
81+
$(CC) -c $(CFLAGS_DEBUG_vorbis) $< -o $@
82+
83+
release_vorbis: $(TARGET_vorbis)
84+
debug_vorbis: $(TARGET_vorbis_DEBUG)
85+
86+
.PHONY: debug_vorbis release_vorbis
87+
88+
DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis))
89+
DEPS += $(patsubst %.o,%.d,$(OBJS_vorbis_DEBUG))

‎engine/compilers/Project1/Project1.vcxproj

-71
This file was deleted.

‎engine/compilers/Project1/Project1.vcxproj.filters

-17
This file was deleted.

0 commit comments

Comments
 (0)