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

2336 Commits

Author SHA1 Message Date
nor..67
2da59144c0 - fix blender loader losing texture origin, which caused storing of all images in the j3o instead of referencing them via the assetManager 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10230 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-29 04:16:58 +00:00
rem..om
361e45d04e Applied parent transforms if any in the lookAt method of Spatial. 
updated javadoc

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10225 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-28 21:01:19 +00:00
sha..RD
d6448dd112 * Ensure bind pose format and num components matches base buffer. Fixes crash when batching model with 3D tangents 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10219 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-28 02:29:49 +00:00
Sha..om
cc9379b42a * Check to ensure all buffers have the same number of components when merging. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10214 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-28 01:50:43 +00:00
sha..RD
84183ad154 * Material.setParam() now calls setTextureParam() instead of messing up internal state if the type is a texture 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10209 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 23:05:08 +00:00
sha..RD
9eb9463261 * Ensure that MatParam.value and MatParamTexture.texture always match, and throw exception if they dont 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10208 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 23:00:39 +00:00
sha..RD
fd0c0fc0a1 * Made all placeholder assets loaded have correct asset keys (based on the key that was used to load them) 
* Also made the placeholder texture use repeat mode if the original was supposed to use it 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10207 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 22:27:15 +00:00
nor..67
f31c1395e8 - make TextureAssetKey flipY option a proper bean property 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10206 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 21:54:54 +00:00
nor..67
437d34636b - make AssetKey not flatten relative paths 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10205 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 20:54:31 +00:00
Kae..pl
d44727cfdd Bugfix: fix to a bug that caused texture to be loaded more than once 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10202 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 16:08:31 +00:00
Kae..pl
fea4c37e06 Feature: user can now decide if the mipmaps will be generated or not; by default 'mipmap' blender flag is used to decide if mips for specified textures shall be generated or not 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10201 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 15:46:00 +00:00
nor..67
ed001d4e33 Blender Loader: 
- try locating textures without causing AssetNotFoundExceptions

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10196 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-27 02:37:05 +00:00
rem..om
de229d4bec Material BlockLanguageParser now accounts for commented lines when computing the line number of a statement 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10189 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-26 23:52:14 +00:00
nor..67
0b92166460 - make AssetKey log SEVERE on relative path outside root 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10172 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-26 01:49:07 +00:00
Sha..om
d169b700f2 * Fixed interpreting unsigned value as signed causing out of bounds when using model with more than 128 bones 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10171 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-26 01:17:27 +00:00
sha..RD
455a621384 * Fix android native crashes and other bizarre problems with 32-bit index buffers 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10145 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-25 02:15:50 +00:00
Kae..pl
01873e6f80 Bugfix: NPE was thrown when object animation was loaded. To fix that modifiers are now loaded after the whole object is loaded to the blenderContext. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10142 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-24 19:40:05 +00:00
Kae..pl
6520fc5b10 Bugfix: fixing a bug that caused negative time values to appear in times[] array in tracks. That caused some animations to behave oddly when in loop mode. Bug and solution found by Tobias Downer. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10141 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-23 16:54:36 +00:00
rem..om
5536f5f824 Also Fixed FXAA vertex shader projection calculation for glsl<1.5 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10140 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-22 23:15:22 +00:00
rem..om
34ab69cef9 Fixed post vertex shader projection calculation for glsl<1.5 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10139 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-22 23:10:08 +00:00
Kae..pl
fada1b5b90 Bugfix: applied fix suggested by Tobiad Downer that properly computes tracks for rotated bones. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10138 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-21 22:50:33 +00:00
sha..RD
289c25e7e8 * Possible fix for memory corruption issue on Android when compressed texture formats exceeds 16 entries. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10137 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-21 21:37:13 +00:00
nor..67
be0c06c5c6 - cleanup IosHarness 
- add ObjcNativeObject

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10135 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-21 01:39:48 +00:00
Kae..pl
071581ad30 Added clear information about bugged blender file. Rarely a pointer appears whose block cannot be found. This is cerainly a bug of blender and we cannot do anything but properly inform user about the situation. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10124 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-20 18:49:48 +00:00
nor..om
28bb74fa95 add dot 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10120 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-20 16:45:19 +00:00
nor..67
3aa478ffde - add javadoc link to SimpleApplication in Application 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10119 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-20 16:40:42 +00:00
nor..67
da58611fc7 - add clarification about Application/SimpleApplication to javadoc 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10118 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-20 16:39:35 +00:00
rem..om
3a809e61f5 BatchNode now properly unbatch subgraph when a Node is removed from it 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10112 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-20 09:00:55 +00:00
Kae..pl
1c2baedbc1 Improvements to the weight and index buffers loading: 
- if more than 4 weights is applied to the vertex then the 'strongest' weights are used
- warning is logged only once when model has vertices with more than 4 weights (and not for every vertex as it was before)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10109 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-19 17:27:36 +00:00
Kae..pl
3d38b634d5 Added functionality that will ignore modifiers that cause no changes to the model due to incomplete (but not invalid) definition. This caused errors when object had for example two armature modifiers and only the second one had armature model attached. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10087 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-17 19:44:05 +00:00
rem..om
e3236e20b4 BatchNode now updates its geometric state right after batching. 
This is to avoid to wait for the next update for the generated mesh to be consistent with underlying geometries.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10077 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-15 23:08:53 +00:00
rem..om
c6d659684e BatchNode and physics : Reverted previous change and made the batchNode batch geom to ignore physics. 
see post http://jmonkeyengine.org/forum/topic/batchnode-breaks-createmeshshape/page/2/#post-200684

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10076 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-15 23:05:28 +00:00
rem..om
dada1c1d38 CollisionShapeFactory.createCompoundShape now exclude geometies the are batched in a BatchNode. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10070 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-14 22:28:59 +00:00
Kae..pl
601a34ba99 Fixed an error that caused NullPointerException to be raised if a curve had no taper object applied. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10069 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-14 16:39:57 +00:00
Kae..pl
61ad771748 Bugfix: 538: Multiple issues with female3.blend 
Yay finally found that one :D Models with multiple materials and armatures should now load withour mesh deformations :D

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10066 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-13 21:32:04 +00:00
bre..om
4bbbf7dbe8 changed terrain to use a ShortBuffer if the index count is less than 65535 so it can work on more android devices 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10065 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-13 16:21:52 +00:00
nor..67
4f02b407cf - remove usage of Box mesh constructor with position from BasicGame template 
- deprecate Box mesh constructor with position and add cause to javadoc
- BOOYA

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10064 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-13 01:00:53 +00:00
rem..om
17b53db1aa Changed all NullPointerException in ShaderSource to IllegalArgumentException 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10063 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-12 21:36:40 +00:00
Zer..om
ec95e50f85 Added three "always present" modes to the list of windows resolutions so that these 3 options are always there no matter what the monitor natively supports. (Unless the minimum is set to higher than them of course). 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10062 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-09 14:41:19 +00:00
iwg..ic
e21f22e6dc Fixed issue with handling Multi-Touch not tracking MOVE for second finger when first finger is lifted. Thanks to kumasao. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10061 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-08 17:45:31 +00:00
iwg..ic
ab5282fb2d Additional fix for http://code.google.com/p/jmonkeyengine/issues/detail?id=504. 
Fixes displaying leftover characters in BitmapText when setting the text to a smaller string and a weird situation where the scene would stop rendering do to improper buffer limit.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10060 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-08 17:10:32 +00:00
rem..om
609d51dbfd Further fix and cleanup to SSAO for glsl < 1.5 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10059 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-08 17:02:33 +00:00
nor..67
21e5244c0a Fixed ssao filter for opengl < 1.5 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10058 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-08 16:52:41 +00:00
rem..om
9a6fe1fdf5 Fix to previous commit to OGLESShaderRenderer. Accidently committed unrelated and non working changes to the renderer. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10057 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-07 19:41:01 +00:00
jul..om
35697b036e Temporarily fixes some things with JARs (for Java and native libraries used by JogAmp) in order to allow some people to run the demos easily 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10056 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-06 13:31:59 +00:00
rem..om
68e0e835f5 Ogles renderer now correctly supports Verctor4 uniforms 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10055 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-06 11:20:59 +00:00
rem..om
39d0939879 MotionEvent upVector is now defaulted to Y axis 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10054 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-04 18:04:23 +00:00
nor..67
5d9b67214a - add some javadoc to HingeJoint setLimit 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10053 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-04 13:03:16 +00:00
rem..om
a9eec4c1b2 Jaime model, and test case 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10052 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-01 11:04:33 +00:00
rem..om
3f815a0c70 Made the "Continue" buttont he default button of the new setting dialog box 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10051 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2013-01-01 09:39:06 +00:00