1153 Commits

Author SHA1 Message Date
nor..67
f55a277cd9 - remove unnecessary checks in RenderQueue.renderGeometryList()
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8801 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-26 01:51:32 +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
sky..ok
1bcf9164e8 Removed whitespace at end of line in mergeGeometries (I'm not a perfectionist)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8791 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-23 21:53: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
nor..67
7d91cb391d - add missing depend in build file
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8772 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 15:20:12 +00:00
nor..67
00014816f3 - recursive svn revert
- move all svn revert stuff to main build file


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8771 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 15:12:32 +00:00
nor..67
218f6f81fe SDK:
- optimize build process on server

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8770 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 14:57:00 +00:00
sha..rd
c76ae508ff * I fixed a bug this time. For real
* Reset the material list in MeshLoader so state doesn't leak. Fixed incorrect "material not found" errors

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8766 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 03:37:11 +00:00
nor..67
8405fb060b - revert InputManager changes
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8763 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-22 00:41:15 +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
7f39e256aa - remove physics shape creation from TerrainFractalGridTest altogether
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8744 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 21:46:46 +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..67
2f45134fd5 - fix TerrainPatch recognition in terrain compound generation
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8739 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 12:45:39 +00:00
nor..67
397c2acec8 - fix scaling in terrain compound generation
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8738 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 12:41:49 +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
nor..67
aa4b8d19e7 - create HeightFieldCollisionShapes in CollisionShapeFactory CompoundShape generation as well
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8736 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 12:02:16 +00:00
nor..67
bd613fee2b - fix bullet CollisionShapeFactory for new terrain heightfield
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8735 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 11:50:18 +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
sha..rd
c6c4cf53a0 * Some minor optimizations
* Disable dead zone check for mouse axes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8732 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-20 00:18:02 +00:00
nor..67
28ad6d72eb - make UrlLocator not print warning when asset can not be found (FileNotFoundException)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8724 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-19 13:11:10 +00:00
nor..67
7927ad4bbf - add SDK workaround for UrlLocator
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8722 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-19 09:38:09 +00:00
nor..67
fce5f6556b - fix in VideoRecorderAppState cleanup
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8718 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-18 00:39:39 +00:00
nor..67
86956cf130 - make VideoRecorderAppState record post effects..
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8717 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-18 00:34:56 +00:00
nor..67
7f17c8d1f1 - javadoc update and better default file creation for VideoRecorderAppState
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8716 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-18 00:17:50 +00:00
nor..67
183f46ed3e - add empty constructor to VideoRecorderAppState using user.home and currentTimeMillis
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8715 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-18 00:03:47 +00:00
nor..67
69e691872d - simplify multithreading in VideoRecorderAppState
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8714 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 23:24:00 +00:00
nor..67
04e348f0fb - improve multithreading in VideoRecorderAppState
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8713 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 21:17:54 +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
nor..67
47e393ba23 - add javadoc to VideoRecorderAppState
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8710 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 02:34:11 +00:00
nor..67
11b5a1395d - make timer of VideoRecorderAppState actually throttle fps if actual fps is greater than target fps, threaded file writing
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8709 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 02:17:35 +00:00
nor..67
f6e3a3eab2 - set NanoTimer when detaching VideoRecorderAppState
- make File in VideoRecorderAppState accessible

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8708 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-17 01:23:54 +00:00
nor..67
0420b4121e - cleanup VideoRecorderAppState
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8707 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 22:50:36 +00:00
nor..67
fa68e89e6c - add fix for video recorders IsoTimer getTime()
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8706 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 22:38:50 +00:00
nor..67
e8ffefe0e4 - add VideoRecorderAppState with M-JPEG avi output using java only
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8705 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-16 22:22:03 +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
796f912ea1 - update test data and Test names for TerrainGrid
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8694 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 23:26:36 +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
4d9783ec81 - add workaround for bugged TerrainGrid test data
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8692 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2011-11-15 23:06:42 +00:00