163 Commits

Author SHA1 Message Date
bre..ns
9da184fcd7 cleaned up geomap code
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8808 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-26 21:47:04 +00:00
bre..ns
36453a919c TerrainGrid no longer needs initialize() called, handled automatically now.
TG normal seams fixed

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8807 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-26 18:38:46 +00:00
bre..ns
b736768b2d fixed terrain normals
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8806 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-26 18:22:24 +00:00
Sha..rd
e57637f307 * Set default shininess value to 1 for TerrainLighting.j3md, it has to be this way to avoid an NVIDIA bug. Please don't change it back but fix the shader instead
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8800 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-25 19:41:43 +00:00
bre..ns
5bc91e15b1 updated defaults in TerrainLodControl constructor
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8775 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 23:30:53 +00:00
bre..ns
ad98c62321 fixed terrain normals
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8761 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-21 23:26:29 +00:00
bre..ns
08cb3182bd * set terrainLighting mat default shininess to 0
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8747 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-21 17:29:33 +00:00
nor..67
8d3aa7bad9 - fix in GeoMap constructor
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8743 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 21:40:34 +00:00
nor..67
ca69ef57b7 - don't use floatBuffer.array() in terrain for deprecated methods
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8742 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 20:55:41 +00:00
nor..67
1e100399f1 - another fix in terrain deserialization for old files
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8741 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 20:35:45 +00:00
nor..67
8b60ba35b2 - fix terrain deserialization for old files
- fix GeomMap / LODGeomap signature to be backwards compatible

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8740 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 13:59:22 +00:00
nor..om
197bba7fe8 - fix TerrainPatch method signature to not break old projects, deprecate getHeightmap, add new getHeightMap
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8737 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 12:09:21 +00:00
sha..rd
268a464191 * Make Geomap and LODGeomap use a float[] heightmap internally instead of FloatBuffer
* Remove normal map buffer from Geomap, not needed since its generated procedurally 
 * Optimized LODGeomap normal buffer generation to create less garbage

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8734 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 00:24:13 +00:00
sha..rd
b192166072 * Improve speed of TerrainLighting shader so no ALU is done per normal map but at the end only
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8733 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 00:18:44 +00:00
bre..ns
2253690024 normen made me do it!
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8712 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 19:03:36 +00:00
bre..ns
4e34217111 * Terrain API changes to better support TG in SDK terrain editor
* Refactored TG slightly.
* Updated TG tests
* new TG alphamap test data

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8711 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 18:38:41 +00:00
bre..ns
de5591053d terrain javadoc
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8703 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 16:30:36 +00:00
nor..67
344c0f11c9 - add some getters to TerrainGrid and AssetTileLoader, fix method name updateChildrens->updateChildren (added deprecated redirect of old method)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8702 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 16:03:48 +00:00
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