OSDN Git Service
Xoppa [Mon, 1 Apr 2013 18:48:48 +0000 (20:48 +0200)]
Update gdxinvaders to render the arraylist at once.
Xoppa [Mon, 1 Apr 2013 18:47:42 +0000 (20:47 +0200)]
Set shader before sorting, change signature so its possible to add multiple RenderableProviders at once, add addding with only shader, add adding arrays.
Xoppa [Mon, 1 Apr 2013 18:44:54 +0000 (20:44 +0200)]
Add Model#getManagedDisposables() and check if a Disposable already exists before adding.
badlogic [Sat, 30 Mar 2013 09:01:32 +0000 (10:01 +0100)]
minor clean up in JsonModelLoader
Mario Zechner [Sat, 30 Mar 2013 08:55:36 +0000 (01:55 -0700)]
Merge pull request #323 from xoppa/new3dapi
New3dapi, remove old code, gles10 renderer, etc.
Xoppa [Sat, 30 Mar 2013 00:57:18 +0000 (01:57 +0100)]
This shouldnt be included (was to test an issue on the tracker)
Xoppa [Sat, 30 Mar 2013 00:37:49 +0000 (01:37 +0100)]
Forgot to commit this (i should really cleanup)
Xoppa [Sat, 30 Mar 2013 00:26:55 +0000 (01:26 +0100)]
- Remove old g3d stuff
Xoppa [Sat, 30 Mar 2013 00:24:57 +0000 (01:24 +0100)]
- Update gdxinvaders to use new 3d api (todo: explosions)
Xoppa [Sat, 30 Mar 2013 00:23:04 +0000 (01:23 +0100)]
- Update the tests to use the new 3d api
- Disable ShadowMappingTest and SoftMeshTest for now
Xoppa [Sat, 30 Mar 2013 00:20:46 +0000 (01:20 +0100)]
Add GLES10Shader
Xoppa [Sat, 30 Mar 2013 00:18:51 +0000 (01:18 +0100)]
- Move ObjLoader
- Make JsonModelLoader dont implement ModelLoader
- Rename NewMaterial to Material
- Add ModelInstance constructor by position
badlogic [Thu, 28 Mar 2013 22:05:13 +0000 (23:05 +0100)]
introduced RenderableProvider, to generalize ModelBatch
badlogic [Thu, 28 Mar 2013 21:55:03 +0000 (22:55 +0100)]
made attribte non-disposable again
badlogic [Thu, 28 Mar 2013 21:48:39 +0000 (22:48 +0100)]
fixed up Xoppa's PR as discussed on IRC
Mario Zechner [Thu, 28 Mar 2013 21:41:11 +0000 (14:41 -0700)]
Merge pull request #322 from xoppa/new3dapi
New3dapi: Add Model.ManagedInstance, implement Disposable for Model, ModelInstance...
badlogic [Thu, 28 Mar 2013 21:35:15 +0000 (22:35 +0100)]
i suck
badlogic [Thu, 28 Mar 2013 20:54:19 +0000 (21:54 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
badlogic [Thu, 28 Mar 2013 20:54:03 +0000 (21:54 +0100)]
more animation stuff
Xoppa [Thu, 28 Mar 2013 20:43:53 +0000 (21:43 +0100)]
Remove useless code
Xoppa [Thu, 28 Mar 2013 20:35:21 +0000 (21:35 +0100)]
Add Model.ManagedInstance, implement Disposable for Model, ModelInstance, NewMaterial, Attribute.
Xoppa [Thu, 28 Mar 2013 20:17:33 +0000 (13:17 -0700)]
Merge pull request #321 from xoppa/new3dapi
Update getMaxTextureUnits, add sphere and cone, add BasicShapeTest
Xoppa [Wed, 27 Mar 2013 19:28:52 +0000 (20:28 +0100)]
Update getMaxTextureUnits, add sphere and cone, add BasicShapeTest
Mario Zechner [Tue, 26 Mar 2013 22:46:48 +0000 (15:46 -0700)]
Merge pull request #318 from xoppa/new3dapi
Redesign ModelBuilder
Xoppa [Tue, 26 Mar 2013 22:39:46 +0000 (23:39 +0100)]
Remove multiple model support, static instance and add begin/end checking
Xoppa [Tue, 26 Mar 2013 21:40:02 +0000 (22:40 +0100)]
Redesign ModelBuilder
Mario Zechner [Tue, 26 Mar 2013 11:45:22 +0000 (04:45 -0700)]
Merge pull request #317 from xoppa/new3dapi
New3dapi, various changes
Xoppa [Mon, 25 Mar 2013 23:30:34 +0000 (00:30 +0100)]
Add very basic cylinder shape
Xoppa [Mon, 25 Mar 2013 18:43:31 +0000 (19:43 +0100)]
Remove unneed initialization
Xoppa [Mon, 25 Mar 2013 18:21:04 +0000 (19:21 +0100)]
Generate ids for materials if none given, very basic ModelBuilder class, use bits for VertexAttributes#Usage, fix bullet tests.
Xoppa [Mon, 25 Mar 2013 00:12:07 +0000 (01:12 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Xoppa [Mon, 25 Mar 2013 00:07:08 +0000 (01:07 +0100)]
Add model ctor
badlogic [Sun, 24 Mar 2013 23:36:27 +0000 (00:36 +0100)]
node translation/rotation/scale are initialized to sane values
badlogic [Sun, 24 Mar 2013 23:34:29 +0000 (00:34 +0100)]
added ModelInstance :D, fixed up tests, bullet has issues with lighting, not sure why
badlogic [Sun, 24 Mar 2013 23:16:41 +0000 (00:16 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Mario Zechner [Sun, 24 Mar 2013 23:16:28 +0000 (16:16 -0700)]
Merge pull request #316 from xoppa/new3dapi
revert
Xoppa [Sun, 24 Mar 2013 23:13:21 +0000 (00:13 +0100)]
revert
badlogic [Sun, 24 Mar 2013 22:41:30 +0000 (23:41 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
badlogic [Sun, 24 Mar 2013 22:41:28 +0000 (23:41 +0100)]
modified model
Mario Zechner [Sun, 24 Mar 2013 22:40:56 +0000 (15:40 -0700)]
Merge pull request #315 from xoppa/new3dapi
New3dapi
Xoppa [Sun, 24 Mar 2013 22:36:33 +0000 (23:36 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Conflicts:
gdx/src/com/badlogic/gdx/graphics/g3d/Model.java
gdx/src/com/badlogic/gdx/graphics/g3d/ModelBatch.java
tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BatchRenderTest.java
Xoppa [Sun, 24 Mar 2013 22:34:40 +0000 (23:34 +0100)]
Cant commit without this
Xoppa [Sun, 24 Mar 2013 22:30:38 +0000 (23:30 +0100)]
Use new model for bullet tests
badlogic [Sun, 24 Mar 2013 22:02:32 +0000 (23:02 +0100)]
made ModelBatch#render(Renderable) public, if someone doesn't want to use Models
badlogic [Sun, 24 Mar 2013 21:53:32 +0000 (22:53 +0100)]
renamed addXXX methods to render in ModelBatch
badlogic [Sun, 24 Mar 2013 21:51:29 +0000 (22:51 +0100)]
fixed node transform calculations
Mario Zechner [Sun, 24 Mar 2013 18:39:22 +0000 (11:39 -0700)]
Merge pull request #313 from xoppa/new3dapi
Additional NewMaterial constructors, use Array instances in ModelData
badlogic [Sun, 24 Mar 2013 18:38:39 +0000 (19:38 +0100)]
added proper disposal of things, need to fix Model#dispose, attribuets may have disposable resources, may even share them with other materials :/
Xoppa [Sun, 24 Mar 2013 18:34:50 +0000 (19:34 +0100)]
Additional NewMaterial constructors, use Array instances in ModelData
badlogic [Sun, 24 Mar 2013 18:28:47 +0000 (19:28 +0100)]
removed RenderBatch and consorts, merged Renderable and RenderInstance, separated RenderBatchListener into RenderableSorter and ShaderProvider
badlogic [Sun, 24 Mar 2013 17:07:40 +0000 (18:07 +0100)]
renamed ExclusiveTextures to DefaultTextureBinder, introduced TextureBinder interface, cleans up texture units properly (we may also render UI and other things...), removed OldBatchRenderer classes, extended Renderable to also contain transform, added NewModelTest, works :D
badlogic [Sun, 24 Mar 2013 15:58:00 +0000 (16:58 +0100)]
Merge branch 'master' into new3dapi
badlogic [Sun, 24 Mar 2013 15:42:28 +0000 (16:42 +0100)]
added ModelBatch, adaption of RenderBatch so i can experiment, see NewModelTest
badlogic [Sun, 24 Mar 2013 15:41:01 +0000 (16:41 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Sun, 24 Mar 2013 15:40:54 +0000 (16:40 +0100)]
fixed issue 1346, freetype font leaked
badlogic [Sun, 24 Mar 2013 15:39:31 +0000 (16:39 +0100)]
fixed issue 1346, BitmapFonts generated by FreeTypeFontGenerator where leaking...
Mario Zechner [Sun, 24 Mar 2013 08:45:17 +0000 (01:45 -0700)]
Merge pull request #310 from xoppa/new3dapi
New3dapi, Bullet
Mario Zechner [Sun, 24 Mar 2013 08:44:11 +0000 (01:44 -0700)]
Merge pull request #311 from nbadal/master
Fix OUYA controller mappings on newer firmwares
Nick Badal [Sun, 24 Mar 2013 03:01:12 +0000 (20:01 -0700)]
Added check for new OUYA device name
Xoppa [Sun, 24 Mar 2013 01:24:24 +0000 (02:24 +0100)]
Use new model
badlogic [Sat, 23 Mar 2013 23:31:59 +0000 (00:31 +0100)]
Merge branch 'master' into new3dapi
Xoppa [Sat, 23 Mar 2013 23:30:09 +0000 (00:30 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Mario Zechner [Sat, 23 Mar 2013 23:28:42 +0000 (16:28 -0700)]
Merge pull request #304 from xoppa/misc
RemoteInput, add #isConnected and RemoteInputListener
Mario Zechner [Sat, 23 Mar 2013 23:28:09 +0000 (16:28 -0700)]
Merge pull request #308 from xoppa/bullet
Bullet, add contact callbacks and add GdxCollisionObjectBridge
badlogic [Sat, 23 Mar 2013 23:25:36 +0000 (00:25 +0100)]
merged new3dapi with master
badlogic [Sat, 23 Mar 2013 23:24:09 +0000 (00:24 +0100)]
added first draft of new Model class
Xoppa [Sat, 23 Mar 2013 22:12:02 +0000 (23:12 +0100)]
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Conflicts:
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
Mario Zechner [Sat, 23 Mar 2013 21:29:21 +0000 (14:29 -0700)]
Merge pull request #309 from xoppa/math
Camera: Fix incorrect order of arguments.
Xoppa [Sat, 23 Mar 2013 20:38:11 +0000 (21:38 +0100)]
Fix incorrect order of arguments.
Xoppa [Sat, 23 Mar 2013 20:36:02 +0000 (21:36 +0100)]
Forgot to commit this
Xoppa [Sat, 23 Mar 2013 19:44:19 +0000 (20:44 +0100)]
Swig generated files
Xoppa [Sat, 23 Mar 2013 19:41:28 +0000 (20:41 +0100)]
Add gdxManagedObject and small change gdxPooledObject
NathanSweet [Sat, 23 Mar 2013 14:58:45 +0000 (15:58 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Sat, 23 Mar 2013 14:58:38 +0000 (15:58 +0100)]
Bounds checking for array insert.
Minor updates.
badlogic [Sat, 23 Mar 2013 11:09:19 +0000 (12:09 +0100)]
updated CHANGES file
Xoppa [Fri, 22 Mar 2013 21:18:48 +0000 (22:18 +0100)]
Swig generated files
Xoppa [Fri, 22 Mar 2013 21:12:15 +0000 (22:12 +0100)]
Add pooling of common used objects.
Xoppa [Fri, 22 Mar 2013 21:10:30 +0000 (22:10 +0100)]
Add compilerSuffix to the build files
badlogic [Fri, 22 Mar 2013 19:10:04 +0000 (20:10 +0100)]
changes updated
badlogic [Fri, 22 Mar 2013 19:09:20 +0000 (20:09 +0100)]
fixed box2d tests using applyXXX, they noe need an explitic wake flag
badlogic [Fri, 22 Mar 2013 19:07:46 +0000 (20:07 +0100)]
Updated box2d version to latest trunk, updated jni wrapper & GWT emu
badlogic [Fri, 22 Mar 2013 18:19:08 +0000 (19:19 +0100)]
Merge branch 'master' of https://github.com/libgdx/libgdx
badlogic [Fri, 22 Mar 2013 18:18:57 +0000 (19:18 +0100)]
added shared libs linking to jnigen
NathanSweet [Fri, 22 Mar 2013 11:41:41 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Fri, 22 Mar 2013 11:32:26 +0000 (12:32 +0100)]
Fixed aliased images that are rotated.
Mario Zechner [Fri, 22 Mar 2013 10:25:00 +0000 (03:25 -0700)]
Merge pull request #307 from ajhager/master
Fixed issue 1309.
badlogic [Thu, 21 Mar 2013 17:11:01 +0000 (18:11 +0100)]
moved and renamed json loader pojos, should be base for new model class.
bullet is currently broken, need to modify the swig stuff.
badlogic [Thu, 21 Mar 2013 15:55:20 +0000 (16:55 +0100)]
[fixed] moved xoppa's package to top-level g3d package, moved old stuff to g3d.old for reference, removed TextureDict and TextureRef.java
badlogic [Thu, 21 Mar 2013 14:24:28 +0000 (15:24 +0100)]
merged with master
NathanSweet [Thu, 21 Mar 2013 12:34:17 +0000 (13:34 +0100)]
Throw better exception if allocation failed.
NathanSweet [Thu, 21 Mar 2013 12:18:35 +0000 (13:18 +0100)]
Merge remote-tracking branch 'origin/master'
NathanSweet [Thu, 21 Mar 2013 12:18:10 +0000 (13:18 +0100)]
Check if pixmap memory was actually allocated.
MobiDevelop [Thu, 21 Mar 2013 05:33:54 +0000 (22:33 -0700)]
Fix loadProperties
MobiDevelop [Thu, 21 Mar 2013 05:19:16 +0000 (22:19 -0700)]
Fix Typo
Joseph Hager [Thu, 21 Mar 2013 04:24:37 +0000 (00:24 -0400)]
Use a more descriptive name for http client response.
Xoppa [Wed, 20 Mar 2013 17:57:43 +0000 (18:57 +0100)]
Change return type
Xoppa [Wed, 20 Mar 2013 17:34:30 +0000 (18:34 +0100)]
Update ContactCallbackTest
Xoppa [Wed, 20 Mar 2013 17:32:36 +0000 (18:32 +0100)]
Swig generated files
Xoppa [Wed, 20 Mar 2013 17:31:32 +0000 (18:31 +0100)]
Add contact callback filter
Xoppa [Wed, 20 Mar 2013 02:27:04 +0000 (03:27 +0100)]
Add ContactCallbackTest