145 Commits

Author SHA1 Message Date
nor..67
49d64f3423 - fix FractalTileLoader using patchSize instead of quadSize
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8701 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 14:21:17 +00:00
nor..67
9a5bb23687 - fix FractalTileLoader not implementing TerrainGridTileLoader
- change TerrainGrid tests to use new TileLoader classes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8700 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 14:18:03 +00:00
nor..67
cfbf116b2d Deprecating HeightMapGrid Kirill :P
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8699 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 01:20:50 +00:00
nor..67
9e18ec6184 - update test data, add list size check to TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8698 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 00:47:46 +00:00
nor..67
534ab2f737 - fix TerrainGrid UpdateControl adding when deserializing
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8697 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 00:36:02 +00:00
nor..67
b087c3e843 - rename TerrainQuadGrid -> TerrainGridTileLoader, AssetQuadGrid -> AssetTileLoader
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8693 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 23:18:39 +00:00
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
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
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
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
bre..ns
0dddd8613f * fix terrain grid camera offset problem
* updated TerrainFractalGridTest to use physics again

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8569 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-01 18:28:43 +00:00
bre..ns
f50266590d default distance for TerrainLodControl
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8458 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-10-18 23:29:35 +00:00
bre..ns
ca628fe5d6 fixed terrain scale bug
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8314 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-27 22:34:42 +00:00
bre..ns
f6ebb7a262 terrain lod control rafactoring
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8249 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-13 03:20:57 +00:00
rem..om
6bbf141b9f terrain : fixed an issue on texture coordinates calculation (Some worm hole through space and time prevented the fix to go with previous commit....or that's just me)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8242 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-11 20:45:30 +00:00
rem..om
9df9ad8564 terrain : fixed an issue on texture coordinates calculation
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8240 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-11 18:27:24 +00:00
bre..ns
3383e2e086 * refactored TerrainLOD Control and removed some legacy classes for it, made it easier to use
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8233 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-09 23:34:15 +00:00
bre..ns
69fe43f079 added terrain.getNormal(x,z)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8200 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-06 05:31:24 +00:00
bre..ns
a899fbc075 fixed TerrainGrid.getHeightmapHeight, fix thanks to @Makeshift
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8198 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-05 23:32:49 +00:00
bre..ns
86124b9a04 terrain.getHeight now scales the result
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8195 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-05 22:27:11 +00:00
sha..rd
f421e2a876 * Removed shiny check in Lighting.frag (for ATI Radeon X1600 and similar)
* Applying default values for materials inside old J3O files
 * Default shininess in TerrainLighting

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8163 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-09-03 22:39:02 +00:00
bre..ns
3f6834d7c7 fixed terrain picking bug
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8138 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-31 15:49:53 +00:00
bre..ns
6940694e14 * fixed bug with terrain collision and flat terrain having a zero-volume bounding box
* corrected terrain.getHeight()

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8135 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-30 15:43:38 +00:00
bre..ns
044e797da1 javadoc
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8081 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-25 00:19:18 +00:00
bre..ns
fa46b16e87 changed normal and tangent generation for terrain to handle scale, removing artifacts
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8070 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-24 16:12:38 +00:00
bre..ns
8198719cdf removed commented out code
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8067 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-23 20:22:04 +00:00
bre..ns
14cc4eb3b2 improved heightmap smooth algorithm
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8066 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-23 20:19:34 +00:00
bre..ns
7a954c0650 removed a premature commit to terrain tangents that isn't fully working yet
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8063 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-23 00:59:44 +00:00
bre..ns
77718d1f15 flipped terrain texture coordinates. New tangent calculations. Warning if heightmap is different size than specified terrain
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8060 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-22 23:11:20 +00:00
rem..om
36dd462c4f Test rundown part 1 :
- fixed NPE in FilterPostProcessor
- fixed compilation error in terrain lighting

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8028 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-17 16:01:31 +00:00
sha..rd
db0a4f23a8 * New block language parser
* Rewrote J3M loader
 * AssetManager.unregisterLocator() must be implemented
 * Added support for material default vars
 * Apply NVIDIA spot light fix for TerrainLighting

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8024 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-17 03:25:48 +00:00
rem..om
5476be99f7 SpotLight : Applied the same changes to terrain lighting
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7979 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-08-05 17:37:29 +00:00
ant..om
dfef1a6dfe Fix: fixed a bug when using alphamaps with TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7904 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-22 21:45:48 +00:00
nor..67
58d485467a - fix lighting compile error
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7894 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-22 00:15:55 +00:00
rem..om
99a4b00c15 - Added SpotLight light type.
- Implemented spot light shading for lighting (pixel and vertex lighting) and terrain shader

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7893 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-21 21:58:46 +00:00
bre..ns
c54ce7be27 reduced terrain save j3o file size
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7883 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-19 00:00:50 +00:00
ant..om
026abb5a74 update: removed tileLoaded from TerrainGridListener, one should use tileAttached and tileDetached instead.
updated the tests as well

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7849 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-11 09:54:03 +00:00
sha..rd
a24becee32 * Replaced all usages of ByteBuffer.allocateDirect() with BufferUtils.create***Buffer() so that memory can be tracked
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7845 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-09 20:02:39 +00:00
bre..ns
7b93faa8e1 fixed but with normals not updating in terrain
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7844 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-07-08 15:10:25 +00:00