2589 Commits

Author SHA1 Message Date
PSp..om
86a3b0532c Save and restore the color in the nifty-optimization
method: render(RenderManager rm, ColorRGBA color)
So that it doesn't clobber other BitmapText that just
happens to be using the font.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9769 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-24 18:06:00 +00:00
rem..om
d980519674 Re-introduced alphaDiscardThreshold in lighting frag
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9768 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-24 16:40:03 +00:00
Sha..om
d329e243fa * dotScene loader: prevent issue when dotScene file is missing an externals section.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9767 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-24 15:49:22 +00:00
Sha..om
0995dcf9b6 * Change shadow direction to demonstrate bug
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9766 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-24 15:02:48 +00:00
PSp..om
a7717d9ea2 Reverting the changes made in r9389
http://code.google.com/p/jmonkeyengine/source/detail?spec=svn9389&r=9389
That caused the StringBlock to be recreated every
time the text was set to "".  Doing this blew away
90% of BitmapText's internal state causing subsequent
text to be the wrong size, misaligned, etc.
The original reason for the change needs to be revisited.
Big comment left in code with the original change commented
out.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9765 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-24 05:54:08 +00:00
rem..om
e0df200dfd Properly update the Height map and normal map to the water filter material when setting those textures to the filter
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9764 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-23 18:38:36 +00:00
PSp..om
bd2695061d Updates to build with latest joystick changes.
This breaks joysticks on android until they can be
ported to the "new way"... but at least it should build.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9763 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-23 09:01:02 +00:00
PSp..om
2970ff46b3 Updated the joystick test to allow better testing
of joysticks and gamepads.  It now presents a gamepad
on the screen that updates itself whenever any connected
joystick or gamepad are used.  This allows the tester
to compare the actual controller layout to the "default"
controller layout.
Information about the active joystick's available axes
and buttons is also rendered to the display.
A dump of all controllers and their components is written
to joysticks-###.txt file.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9762 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-23 04:18:49 +00:00
PSp..om
6db4dde5e8 Changes to support new joystick refactoring.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9761 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-23 04:16:15 +00:00
PSp..om
81837959b1 A refactoring of the joystick class to provide more
information about buttons and axes and allow slightly
easier hook-up of stanard triggers.
The events have also been expanded to include the
actual JoystickAxis and JoystickButton objects.
Changes to the JInput joystick support coming next
commit.  Android joystick stuff was modified to compile
but is totally broken with this change until the code
can be properly updated.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9760 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-23 04:15:45 +00:00
iwg..ic
8daa039ecc Add methods to control FlyByCamera zooming speed.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9759 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-22 04:08:55 +00:00
iwg..ic
47cb989c63 Added mapping of Android Scale Gesture (ie PinchZoom) to mouse wheel. If mouseEventsEnabled is set, mouse wheel reacts to the gesture.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9758 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-22 03:44:17 +00:00
rem..om
bdb715e527 Shadows : attempt two to fix them on mac.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9757 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-21 20:26:08 +00:00
nor..67
1a2b56121b SDK:
- add invert filter (thanks to @jmaasing)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9756 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-19 22:52:03 +00:00
rem..om
c31c7a406b BatchNode : fixed bounding issue
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9755 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-19 18:01:41 +00:00
rem..om
6c2dcc472d Lighting and Shadows :
- removed the const keyword for the poisson disk array declaration in the shader (attempt to fix the shader on mac)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9754 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-19 16:25:32 +00:00
Sha..rd
5f88d137a8 * Add RenderManager.setUsingShaders() method in case it is used directly (without RenderManager.render()).
* Fix issue where LwjglOffscreenBuffer's thread would freeze after it has been destroyed 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9753 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-19 04:09:06 +00:00
Sha..rd
243bba48ff * Improvements to GLSL loader handling of libraries. The order of #import is maintained, it is also possible to #import in the body of the shader (but it will not be included twice). Fixed issue 523.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9752 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-19 01:00:33 +00:00
bre..om
bd7c10ba80 Added more comments to the TerrainLighting test. Made the TerrainLighting material more forgiving if normal maps aren't set
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9751 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-18 22:24:04 +00:00
rem..om
384f4ac1c2 Lighting and Shadows (PSSM only) :
- re introduced the alphaDiscardThreshold as explained in prvious commit. It's not binded to the AlphaTestFallOff fixedfunc binding
- Added a small poly offset to post shadow technique, this greatly help in fixing shadow acne.
- Added Poisson disc sampling PCF Filtering for shadows
- Properly passed the shadow map size as a define in the shaders and remove the hardcoded value
- Pssm15 don't use the textureSize function anymore and use the same shadow map size define ( this increased performance quite a bit)
- Optimized the shaders code a bit
- Better PSSM test

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9750 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-18 21:37:11 +00:00
rem..om
2915316e45 One can now have a block ForcedRenderState in a technique defnition. this renderstate if filled will be forced into the renderer when the technique is forced
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9749 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-17 21:32:48 +00:00
rem..om
eab37f7fce Reverted changes in RenderManager from previous commit as they were not meant to be committed and unrelated to the change
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9748 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-17 20:14:58 +00:00
rem..om
5111fd8b66 Implemented fixedfunc binding for AlphaTestFallOff
- Made the relvent changes in lwjgl1Renderer
- Changed the check in the lwjglRenderer (note that it's deprecated in opengl 3)
- Removed the test in the OglESRenderer since GL_ALPHA_TEST/GL_ALPHA_FUNC no longer exists in OGLES 2, this must be handled in the fragment shader aka the alphaDiscardThreshold that is coming back in an upcoming commit.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9747 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-17 19:36:41 +00:00
Sha..om
13132e10cc * Remy: please rename context.alphaTestEnabled to alphaTestFallOff and make it a float. Also, add FixedFuncBinding.AlphaTestFallOff and make J3MLoader parse it
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9746 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-17 16:41:28 +00:00
iwg..ic
5b326f4054 Minor reorganization of how appSettings are created and passed to the Context on Android.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9745 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 22:00:27 +00:00
iwg..ic
fa6716877e Remove requirement for buffer type images to have width=height on Android devices that do not support NPOT. Now images allowed as long as both height and width are POT on devices that don't support NPOT.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9744 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 20:58:09 +00:00
Sha..rd
f7a653088f * Put rangeCheck() back
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9743 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 01:51:17 +00:00
Sha..rd
105d27fddf * Problem: Slow. Solution? Speed.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9742 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 01:27:54 +00:00
Sha..rd
47563c2cf1 * .. and here's the change that makes the previous change actually faster
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9741 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 01:13:40 +00:00
Sha..rd
dbc59934a7 * Added new image codec that should be faster for byte component image formats like RGBA8
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9740 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 00:54:51 +00:00
Sha..rd
06d18c1366 * When a "severe" AssetNotFoundException is thrown for subassets, it won't be ignored by SceneLoader
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9739 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 00:53:33 +00:00
nor..67
687dbb4d13 SDK:
- re-add ogrexml check for mesh.xml files

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9738 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-16 00:17:01 +00:00
nor..67
02ed25ed0d SDK:
- remove ogrexml check for material name
- remove dedicated loadAsset/saveAsset overrides in OgreXMLDataObject and OgreSceneDataObject

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9737 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 23:58:48 +00:00
Sha..rd
cf2bd1de24 * dotScene loader can now load cameras (loads them as CameraNode). Fixes issue 226
* dotScene loader now correctly loads materials in <externals> tag. This means models exported in "Separated Materials" mode now work. Also models exported in single material mode no longer require you to rename them to match the scene name. Fixes issue 519.
 * dotScene loader also considers the ambient color in the <environment> tag and adds an AmbientLight to the scene.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9736 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 20:29:55 +00:00
Sha..rd
a5275875a7 * HoverTank blender model now references the correct textures (PNG -> JPG)
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9735 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 20:18:35 +00:00
Sha..rd
a7bcb2b6e6 * Buggy model no longer has embedded lights
* Buggy model now uses J3M file by default 
 * Enabled specular for buggy - since specular color is set to black by default

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9734 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 20:07:42 +00:00
Sha..rd
f9e99ab956 * Fixed rather silly bounding box computation bug. Thanks to @raistm.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9733 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 19:36:42 +00:00
Sha..rd
a0d0b0922f * ArmatureModifier now sets 0.0 weight if the vertex should not be influenced by any bones. This fixes "disappearing" object issues in animated models.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9732 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 19:35:59 +00:00
rem..om
5635bc2ff1 Geometry : fixed an issue where batching information were copied over cloning causing problem because the cloned geometry was marked as batched but was not.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9731 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 13:49:34 +00:00
rem..om
2577485727 BufferUtils : ensureLargeEnough now set the limit to the buffer capacity if it exists to avoid creating a new buffer instead of reusing the previous one.
see http://jmonkeyengine.org/groups/development-discussion-jme3/forum/topic/bugbufferleak-in-ensurelargeenoughbitmaptextpage/?#post-188976

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9730 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-15 12:09:07 +00:00
Kae..pl
d2e6648eb3 Bugfix: solved problem when one 2D texture was about to be cast on other 2D texture while they had exactly the same UV coordinates.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9729 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 11:32:38 +00:00
Kae..pl
ed2a224829 Bugfix: alpha map cannot be applied to unshaded material.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9728 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 11:29:16 +00:00
Sha..rd
2bfd91ef2e * MeshLoader will no longer generate NaN weights for vertices with no bone-weight assignments. Instead it will generate zero which will cause those vertices to remain in the bind pose.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9727 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:26:08 +00:00
Sha..rd
a2ff0ba179 * Fix issue where a bone weight in a vertex was set to all zero would cause the vertex to snap to 0,0,0
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9726 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:24:10 +00:00
Sha..rd
8c2bdebbae * AnimControl now forces the animation map to be non-null in all cases - when creating a new AnimControl, cloning it or loading from J3O.
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9725 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:22:31 +00:00
Sha..rd
1ddb7903db * OBJ loader now supports loading models that use negative indices in the face statement
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9724 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:21:21 +00:00
Sha..rd
e848c53ef4 * Add small work around in MTL loader: Do not accept "d 0" or "Tr 0" as they hide the model
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9723 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:20:34 +00:00
Sha..rd
46fb4c43b4 * Fix UTF8 error in ConstraintDefinition
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9722 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-14 05:19:57 +00:00
Kae..pl
c929d0ca41 Bugfix: added jme serialization for CameraNode, LighNode, CameraControl and LightControl (as suggested by @rectalogic).
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9721 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-13 17:57:14 +00:00
Kae..pl
711b8ab9ca Huge constraints refactoring (the computations might yet not be perfect, but models loading should get much less crashes).
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9720 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
2012-09-13 15:19:05 +00:00