sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,389 Commits 21 Branches 35 Tags
Commit Graph

2389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roo..li
9c3efe2e7a registerLocator(string,string) is deprecated, replaced them by registerLocator(string,class) in these jmetest classes. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9394 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-19 16:16:02 +00:00
sky..ok
24145d10bc Removed more println's 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9392 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 17:54:15 +00:00
sky..ok
bbf32420a2 Paul makes me feel like less of a man <3 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9391 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 17:50:47 +00:00
sky..ok
6b91149956 Remove debug statement I left in r9389 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9390 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 17:41:02 +00:00
sky..ok
96fce01608 Fix for bug when assigning an empty text string to a BitmapText already showing content 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9389 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 17:39:58 +00:00
nor..67
eca1fae8bc SDK 
- update manual from wiki

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9388 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 11:38:30 +00:00
nor..67
7c18281818 - fix collision between linked bodies option for joints in native bullet (thanks to @iwgeric) 
- add fixed osx binary (win/linux are built on the server)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9387 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-18 09:31:50 +00:00
bre..ns
5090b397a4 removed sysout from DesktopAssetManager and replaced with logger 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9386 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-15 15:48:59 +00:00
bre..ns
f654109aa4 added in a NeighbourFinder interface to TerrainQuad so it can be used for tiling outside of TerrainGrid 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9385 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-14 17:33:20 +00:00
rem..om
3f5fd9f6c3 Parallax mapping : changed calls to texture2DLod to texture2D as it fails on mac since it shouldn't be used in a frag shader 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9384 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-13 19:51:57 +00:00
Kae..pl
816b082c73 Adding UV coordinates to the model if they are defined for the mesh even if no material is applied. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9383 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-13 15:09:58 +00:00
Kae..pl
f8771f437e Fix to loading object animation for Blender 2.62+ (found by 'reactlogic'). 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9382 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-13 14:49:50 +00:00
sha..rd
2cec3f82eb * Fix ClassCastException when loading old blender-based j3o files 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9381 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-13 01:13:45 +00:00
Sha..rd
4fc046a0e1 * Particle meshes now call updateCounts() when number of particles changes. This might fix native crashes in some cases. 
* Removed completely useless merge sort on the entire particle array from ParticleTriMesh ...
 * Added a small note in the javadoc of VertexBuffer.updateData() regarding bizarre issues

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9380 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-12 19:48:49 +00:00
Sha..rd
30dfa52f51 * TGA loader now supports loading colormapped (non-RLE only) images 
* A non-supported format now yields correct message in TGA loader 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9379 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-12 19:19:26 +00:00
Sha..rd
cac820803b * Better checking for MRT in renderer (first against max color attachments then against draw buffers) 
* Now uses only OpenGL2 draw buffers instead of relying on GL_ARB_draw_buffers existing
 * copyFrameBuffer() was non-functional when used against the main framebuffer because the width/height were set to zero erroneously, now it uses the current viewport parameters.
 * Added TestRenderToCubemap to demonstrate render to cubemap functionality, it also uses MRT to render to all the cube sides

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9378 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-12 18:38:31 +00:00
bre..ns
fba447dc60 added rotate tool to SDK, thanks @kbender 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9373 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-11 00:12:54 +00:00
nor..67
79ab8cd945 SDK: 
- add modified state and savecookie accessors to AssetData

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9372 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-10 12:08:00 +00:00
rem..om
2b097ebdfc SkeletonControl : check hasArray for both BoneWeight and BoneIndex buffers before prep them for anim (convert them to non direct). 
This to avoid an UnsupportedOperationException on android 4.0 when fetching the backing array on the BoneWeight buffer.
Before, only the BoneIndex was checked, and, for some mysterious reason, this ByteBuffer can be direct AND have a backing array on android 4.0. thus the preping wasn't done on the BoneWeight buffer that was kept as Direct. Hence the exception when fetching the array.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9371 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 19:38:59 +00:00
nor..67
583cf61d37 - update bullet build script to allow bullet/jme development on windows 64 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9370 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 13:30:05 +00:00
nor..67
6843b2a2a5 - update mac bullet binary and natives jar file 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9369 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 13:24:11 +00:00
nor..67
26c3cb759c Updating linux bullet binaries 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9368 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 13:22:31 +00:00
nor..67
97ad04a8bd Adding 64bit bullet dll 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9367 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 13:21:36 +00:00
nor..67
336033cea7 - fix build of 64bit windows bullet dll 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9366 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 13:03:13 +00:00
nor..67
783ec50326 - final version of Material/RenderState comparison and hashValue methods, he who changes them again has to buy a crate of beer for all core members 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9365 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 12:50:01 +00:00
nor..67
c803ffd1ae - add possible build fix for bullet windows64 linux/mingw 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9364 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-09 12:36:51 +00:00
rem..om
311242b6d9 - Framebuffer can now render to a cube map face, thanks to dflemstr 
http://jmonkeyengine.org/groups/contribution-depot-jme3/forum/topic/how-do-i-render-to-a-face-of-a-texturecubemap/?#post-171990

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9363 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 19:51:08 +00:00
rem..om
c9d5011555 used dynamicEqual instead of dynamicHashCode in BatchNode and GeometryBatchFactory 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9362 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 19:10:50 +00:00
rem..om
d33cbce333 - Changed BatchNode and GeometryBatchFactory according to material recent changes. 
- BatchNode now does incremental batch upon adding a new geom to the batch (was there before but didn't work properly).

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9361 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 19:02:13 +00:00
ShA..Rd
960837fe02 NORMEN IS ALWAYS RIGHT 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9360 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 17:45:41 +00:00
ShA..Rd
2339b7d2e5 * Fix Material.hashCode/equals and RenderState.hashCode() 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9359 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 16:16:45 +00:00
sky..ok
a625e8ae2a Javadoc fixes R PHUN 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9358 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 15:11:38 +00:00
PSp..om
8bfe663402 Fixed the video recorder app state to attach itself 
to the last _enabled_ view instead of just the last
view.
Fixed the internal IsoTimer to report the proper
resolution.  It was reporting picoseconds when it
is actually returning milliseconds.  This manifested
itself as a stuck g_Time in my shaders because time
was creeping along so slowly (if at all... I'm not
sure float has enough resolution to measure 
1 / 1000000000 resolution.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9357 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 06:13:12 +00:00
nor..67
e52701f3e1 SDK: 
- Make SceneEditor Controller JmeRootNode final

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9356 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:56:11 +00:00
nor..67
352ee2083b SDK: 
- Make SceneEditor Controller good example of the async AWT/GL therading model of the SDK

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9355 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:55:01 +00:00
nor..67
77fc3e3eee SDK: 
- undo some changes due to shady threading raising its ugly head through the changes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9354 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:45:00 +00:00
nor..67
fa03a75cba SDK: 
- undo some changes due to shady threading raising its ugly head through the changes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9353 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:44:45 +00:00
nor..67
714484047b SDK: 
- remove some queueing to make tool selection update faster

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9352 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:29:58 +00:00
nor..67
eaf415cd80 SDK: 
- change back GLSL Editor version (all core plugin versions are unified)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9351 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:07:58 +00:00
nor..67
cf617fcae0 SDK: 
- catch all exceptions when adding/removing ant libraries in ProjectExtensionManager

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9350 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:06:56 +00:00
nor..67
92e2e35aef - change Material.equals to Material.contentEquals 
- update BatchNode, GeometryBatchFactory and Test

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9349 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 22:35:25 +00:00
sky..ok
f6ea856f9e GLObject/GLObjectManager -> NativeObject/NativeObjectManager in docs 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9348 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 17:12:59 +00:00
sky..ok
96e20aad8d Javadoc fixes: Down from 260 to 221 warnings 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9347 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 17:03:25 +00:00
dan..om
690915870c A whole lot of code formatting, unused import removal and other readability fixes. 
Syntax checking should now stop from generating errors with passed jME3 built-in vars. Those variables are only accepted used with "in" or "uniform".

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9346 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 16:09:50 +00:00
nor..67
cd010fa5e7 SDK: 
- change confusing error message

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9345 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-03 17:27:48 +00:00
Kae..pl
858c8ba9ba Fix to properties loading: properties are now stored in Spatial as basic types (supported by UserData) or Savables supported by jme core. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9344 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 18:03:40 +00:00
bre..ns
a5c8cb8ead option to flip texture's Y for skyFactory in SDK 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9343 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 17:33:38 +00:00
Kae..pl
f9593adee1 Fixed NPE error when using a single 'None' texture type in the material definition. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9342 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 16:45:38 +00:00
rem..om
2e704987b9 Fixed alpha variable declaration in SSAO Normal pass shader.Thanks to koris. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9341 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-01 19:16:11 +00:00
ShA..Rd
3d60482b46 * Fix paul complaining 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9340 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-01 14:19:12 +00:00