701 Commits

Author SHA1 Message Date
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
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
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
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
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
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
rem..om
22edb7beb0 Shadows/SSAO and transparency : Removed the AlphaDiscardThreshold attribute from the lighting material. Transparency discarding is now handled by the AlphaFallOff render state (as it should be).
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9330 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-29 20:32:08 +00:00
ShA..Rd
ac59c1ffdf * Fix link error in glow material techniques
* DesktopAssetManager now works as before (flipY and generate mips options are enabled)
 * Fix crash in TestSimpleWater

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9322 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-19 02:25:10 +00:00
Sha..rd
7ec115a768 * AssetManager now returns AudioData instead of AudioNode (similar to new Material() type behavior)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9321 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-16 04:49:21 +00:00
Sha..rd
9390125d6c * NativeObjectManager is now limited for 100 objects deleted per frame to reduce spikes with large heap config
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9319 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-15 19:38:39 +00:00
Sha..rd
0751d9ff76 * Added methods to DesktopAssetManager: addToCache/getFromCache/deleteFromCache/clearCache
* Added new method to AssetCache interface to specify that registerAssetClone() won't be used (for the methods used above)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9318 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-15 18:30:04 +00:00
Sha..rd
c8fa79fbd6 * Fixed issue where an ogre3d animation with no tracks would load, but cause a NPE when loaded again from J3O
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9317 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-15 17:20:04 +00:00
Sha..rd
988110e360 * Removed deprecated methods from AudioNode
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9311 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 20:01:15 +00:00
Sha..rd
924d83ffdb * Fixed up ThreadingManager to actually work with the asset manager, even though nobody uses it
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9310 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 20:00:42 +00:00
Sha..rd
bd4214f3bd * AssetCache is now an interface and can be extended by user. Moved to com.jme3.asset.cache package.
* Added 3 implementations of AssetCache: SimpleAssetCache, WeakRefAssetCache and WeakRefCloneAssetCache
 * Added AssetProcessor interface that handles cloning and post processing of assets after they are loaded
 * AssetKey can now configure which cache/processor to use for a particular asset type 
 * Added AssetManager unregisterLoader method
 * AssetManager now supports more than one AssetLoadListener 
 * Javadoc improvements in AssetManager 
 * Asset interface now renamed to CloneableSmartAsset (which more accurately describes its behavior and use case)
 * DesktopAssetManager now makes proper use of the new AssetProcessor/AssetCache classes when handling asset loading 
 * Added proper equals/hashCode methods to many AssetKey subclasses, which is required for the new system to work properly
 * All AssetKeys were rewritten to work with the new asset system 
 * loadAsset(AudioKey) now returns an AudioNode and not AudioData, similar to the behavior of loadAsset(TextureKey) returning a Texture and not an Image. Because of that, the key storage in AudioData has been removed. 
 * Texture, Spatial, and Material are all cloneable smart assets now and will be cleared from the cache when all instances become unreachable
 * Improved the existing TestAssetCache test to make sure the new system works 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9309 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 19:58:17 +00:00
Sha..rd
f844ca429f * JmeFormatter now uses non threadsafe StringBuilder for performance
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9304 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 19:36:02 +00:00
Sha..rd
f6b5335976 * Formatting and minor changes in Curve, Cylinder, PQTorus
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9303 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 19:34:19 +00:00
Sha..rd
0aa5efb028 * Added license text for asset exceptions
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9302 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 19:32:11 +00:00
Sha..rd
c67e6d32c5 * Since AssetManager registerLoader/Locator method that take a string class are deprecated, AssetConfig will no longer use them
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9301 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-14 19:30:47 +00:00
rem..om
4155cacf74 PssmShadowRenderer : post shadow pas does not write depth anymore, also added a slight polyOffset to avoid z-fighting
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9293 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-12 19:36:40 +00:00
rem..om
d50efde277 Fixed imports from last commit
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9290 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-11 22:28:43 +00:00
Sha..rd
ddca06e607 * Materials.equals() method now works correctly (checking if material will look the same if rendered, in 99.9% of cases..)
* ListMap entries now implement equals method as required by spec

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9289 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-11 22:20:23 +00:00
rem..om
c3ed68cfbb AnimationTrack null checked the animation channel in onStop, onPause and setLoopMode to avoid NPE
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9288 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-11 22:09:37 +00:00
rem..om
bc0207f1fc BatchNode is now indexing the batches by geometry to easily retrieve them during the update phase.
This is fixing this issue http://jmonkeyengine.org/groups/general-2/forum/topic/batchnode-not-accounting-for-transformations-in-cloned-spatials/#post-170945

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9287 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-11 22:03:11 +00:00
nor..67
b7affd0147 - optimize BatchNode a bit
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9286 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-10 22:50:41 +00:00
rem..om
732955a56c fixed BoundingBox merge method javadoc
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9282 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-09 08:24:08 +00:00
rem..om
e5b99b5035 ShadowUtil now use tempVars instead of instantiating new objects
Matrix4f now has a set method that teakes 16 floats like the constructor

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9281 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-09 08:00:00 +00:00
rem..om
cecf807001 SpotLight, inner and outer angle cos is now correctly packed when opening a saved light
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9280 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-09 07:35:20 +00:00
rem..om
bf55974bf4 Changed the way post shadow pass is done. It's now a technique of the lighting material definition.
This allow to have shadows that fully works with partially transparent objects (like trees).
If a material does not have the postShadow technique, the renderer uses the fallback material (like before).

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9279 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-07 19:55:43 +00:00
rem..om
7445565df3 Fixed buffer overflow when increasing the size of a BitmapText (issue 486)
thanks  to Daniel Brunton for the patch
http://code.google.com/p/jmonkeyengine/issues/detail?id=486&colspec=ID%20Type%20Status%20Component%20Priority%20Product%20Milestone%20Owner%20Summary&start=100

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9278 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-07 08:26:17 +00:00
Sha..rd
02742f720f * AppSettings now supports floating point values
* AppSettings now supports custom user settings
 * Add test case TestCustomAppSettings to test custom user settings

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9276 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-04 00:31:52 +00:00
rem..om
a8bfb54b02 Fixed the mix up in fromAngles method's javadoc in Quaternion, pitch is Attitude and roll is Bank
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9273 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-01 16:04:32 +00:00
rem..om
f156b31ce1 Spline now clones the control points to not keep a reference on the given vector.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9272 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-01 08:23:45 +00:00
rem..om
a4c1fd7670 Fixed naming of pitch, yaw, roll thing in rotation that was wrong. Now they are named xAngle, yAngle, zAngle in Spatial and Quaternion. Pitch , Yaw, Roll are just mentionned in the javadoc.
There has been several posts about that, the last in date is here http://jmonkeyengine.org/groups/general-2/forum/topic/confused-about-euler-axes-and-jme-axes/#post-169736

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9271 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-04-01 08:22:26 +00:00
PSp..om
198979bf5a Removed setEnabled() and isEnabled() from the Control
interface since no engine uses of Control will ever call
these methods.  The functionality is still left in 
AbstractControl which makes more sense since it is up
to the control implementation to enable or disable itself
as it sees fit.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9268 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-29 18:49:22 +00:00
Sha..rd
828c8071f6 * Fix BufferUtils.destroyDirectBuffer() in OpenJDK7
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9264 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-25 19:28:05 +00:00
Sha..rd
8973175783 * Try to fix linkVertices in TangentBinormalGenerator (prevent assigning same tangent to verts with different texcoord)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9263 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-25 19:09:03 +00:00
Sha..rd
2cdeb6ebff * Fix animation blending from bind pose issue
* Fix look/cycle modes for animations to prevent result time from being out of range

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9262 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-25 18:41:38 +00:00
rem..om
fecf355de2 ChaseCam : changed all private attributes and methods to protected so people can extend the chaseCam behavior as they see fit.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9260 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-24 09:05:08 +00:00
rem..om
cf93c2c6fc Fixed issue when the last waypoint of a motion path was not triggering listeners
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9259 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-23 10:50:36 +00:00
rem..om
7f6ce84ffd Implemented setSpeed for animationTrack as it needs special treatment
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9258 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-23 10:38:32 +00:00
rem..om
1945a0c1c0 BatchNode and GeometryBatchFactory now uses the material's isEqual method to gather the geometries to batch
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9257 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-03-23 10:00:49 +00:00