1251 Commits

Author SHA1 Message Date
nor..67
3645d09ec2 - add TerrainGrid serialization test
- add TerrainQuad deserialization null checks
- serialize Material in TerrainGrid

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8689 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 23:00:37 +00:00
nor..67
6c3f896604 - another fix in deserialization of TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8685 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:54:51 +00:00
nor..67
666ff483a4 - fix in deserialization of TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8684 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:54:07 +00:00
nor..67
f7d61c8c89 - remove unnecessary serialization in AssetQuatGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8683 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:53:08 +00:00
nor..67
28d0bff4ea - cleanup TerrainGrid constructors & serialization
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8682 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:51:36 +00:00
nor..67
94ec216aab - fix TerrainQuadGrid support in TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8681 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:27:51 +00:00
nor..67
3056d0b25e - change test
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8680 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:23:25 +00:00
nor..67
916af255a0 - change test data
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8679 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 20:18:42 +00:00
nor..67
4105689fea - improve AssetQuadGrid
- add test for TerrainQuadGrid
- add test data for TerrainGrid

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8678 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 19:36:44 +00:00
nor..67
fc23b0173e - add abstraction layer for TerrainGrid that allows serving in full TerrainQuads
- add serialization to TerrainGrid
- add AssetQuadGrid loading TerrainQuads from j3o files (WIP)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8677 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 17:29:09 +00:00
bre..ns
b53c8737c0 more TerrainGrid javadoc
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8676 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 16:12:44 +00:00
bre..ns
fb45230bf2 TerrainGrid javadoc
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8675 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 16:09:32 +00:00
sha..rd
534ee8abfc * Terrain shader no longer flips normal along Y
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8674 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 00:55:45 +00:00
bre..ns
0342cceaaf fixed bug with terrain grid and cached neighbours in terrainQuad not being reset
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8673 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-14 20:43:56 +00:00
bre..ns
253334fd07 * fixed terrain grid issues
* added javadoc

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8672 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-14 16:32:40 +00:00
nor..67
5c519b464c - update to lwjgl 2.8.2
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8670 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-14 11:55:34 +00:00
PSp..om
7a333dda9f On some platforms the selector will not automatically wake up
when the network connection has been closed.  Forcing the selector
to wake up seems to be safe on tested platforms.
Thanks to @philotomy for the catch and fix.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8669 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-14 10:51:25 +00:00
sha..rd
f9a798c651 * Better check for android version. Should prevent NoSuchMethodError: glVertexAttribPointer
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8668 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-14 05:08:12 +00:00
sha..rd
b2ea6e74d2 * Make AWT mouse wheel events consistent with LWJGL
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8666 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-13 23:10:56 +00:00
sha..rd
6110509b8e * Added android 2.2 workaround for glVertexAttribPointer
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8658 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-12 02:55:51 +00:00
nor..67
270703ca58 - change bullet native build process and project
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8657 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-12 00:44:14 +00:00
nor..67
63ad4df79b - change Bullet Native project classpath to use dist jar
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8656 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-12 00:31:27 +00:00
nor..67
9822dc1130 - move back classes *after* jar has been built ^^
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8655 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-12 00:28:58 +00:00
nor..67
72a4282dc0 - make FreeForm project for android code
- change build process to move back class files after creating separate jar files

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8654 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-12 00:10:48 +00:00
nor..67
fcb6b2e6ab Android:
- change glVertexAttribPointer use to API level 8 method signature

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8653 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-11 23:19:54 +00:00
lex..82
687dad1a6b Fixed TangentBinormalGenerator: Added grouping of vertices with the same position and normal. Re-added tangent orientation code to fix some visual artifacts.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8645 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-11 08:41:01 +00:00
sha..rd
4ba21821a3 * Added ability to switch between lit model and tangent display
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8644 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-11 03:30:52 +00:00
sha..rd
5440deeaeb * Commit new test tangent for lex
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8643 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-11 03:19:46 +00:00
sha..rd
3db3648866 * Fix spelling error in AmbientLight: uneffected -> unaffected
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8642 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-11 01:17:07 +00:00
dan..om
fbb396b8a2 * Fixed extrapolateLinear() so it would really extrapolates if bigger than 1 or smaller than 0. The old behavior was to clamp between 0 and 1, doing exactly the same thing as interpolateLinear().
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8616 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-09 04:01:21 +00:00
nor..67
23b4e2fcf0 - synchronized access to AssetManager ClassLoader list
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8606 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 23:36:45 +00:00
nor..67
c0695b0a3a - make ClassLoader list in AssetManager a syncronized list
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8605 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 23:33:11 +00:00
nor..67
9f16b989fe - add a way to add a classpath for loading in-asset classes to AssetManager, use in BinaryImporter
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8600 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 21:18:53 +00:00
sha..rd
511c417fe7 * AssetEventListener now has an additional callback that can be used to detect when a dependent asset has failed to load.
Since dependent assets that were not located have no exception thrown, detection of this event could be needed by some tools e.g. jMonkeyPlatform to indicate to the user that the asset may have not been loaded correctly. 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8597 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 04:56:15 +00:00
sha..rd
66127db26d * Standardized handling for loading dependent assets for all loaders
If asset cannot be located, then the loader must replace the asset that 
was supposed to be used with a placeholder, and raise a WARNING in the log 
indicating that the asset cannot be located, containing both the name of the
dependent asset and the parent asset that is loading it

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8596 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 04:51:58 +00:00
bre..ns
21809776dc allow empty keyframe sets (rotation, translation) to be supplied to SpatialTrack
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8595 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 04:29:22 +00:00
sha..rd
de75b794c2 * Remove duplicate code in MeshLoader that handles loading the material list
* Added javadoc in OgreMeshKey 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8594 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 03:09:22 +00:00
sha..rd
cfd13e8d33 * Added some new lines here and there
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8593 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 03:07:29 +00:00
sha..rd
177c88d645 * Rewrote handling of URL based locators to use a shared UrlAssetInfo.
* The AssetInfo.openStream() must create a new stream each time (required by javadoc/spec)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8592 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 03:04:10 +00:00
sha..rd
d8682c94c3 * Fixed crash that happens when an Ogre3D mesh.xml model has an empty boneassignments tag
* Fixed issue with AnimControl clones sharing references to the list of AnimEventListeners

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8590 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-08 01:11:29 +00:00
nor..67
74c636a464 - re-enable copying of javadoc with nightly build
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8589 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-07 00:43:22 +00:00
PSp..om
d2e2935d90 Default the application timer to NanoTimer. I did this
during construction so that the default JmeContext timer
could potentially still be used by calling app.setTimer(null)
from an apps main().  In that case, the previous behavior
of pulling the timer from JmeContext during init would happen.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8588 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-07 00:25:29 +00:00
bre..ns
6712fccbc3 cleaned up terrainQuad constructor.
Added flexibility to image heightmap

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8585 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-06 17:32:56 +00:00
sha..rd
f15dfe3011 * Fixed issue with an exception getting silenced when MTL was loaded for an OBJ file
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8582 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-06 03:19:15 +00:00
nor..67
15eeef7f65 updating windows 32bit bullet native
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8579 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 23:10:41 +00:00
nor..67
58c54b1aaa native bullet:
- update mac binary

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8578 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 22:28:23 +00:00
nor..67
439c5b36b8 native bullet:
- add ray test code, thanks to @EmpirePhoenix
- clean up import structure
- remove separate jmeUserPointer class


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8577 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 22:25:26 +00:00
sha..rd
83ab68264b * Put arrow texture on alien, generate axis for each vertex
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8576 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 04:17:24 +00:00
sha..rd
0e49c439b7 * Javadoc for Asset
* Javadoc fix for AudioData, BoundingVolume, CollisionResult 
 * Javadoc package.html for asset 
 * Add test for bad tangent generation models 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8575 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 03:35:11 +00:00
sky..ok
6286ac495f Added Javadoc to TerrainQuad constructors
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8574 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-03 02:56:39 +00:00