sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,211 Commits 21 Branches 35 Tags
Commit Graph

2211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rem..om
d33cbce333 - Changed BatchNode and GeometryBatchFactory according to material recent changes. 
- BatchNode now does incremental batch upon adding a new geom to the batch (was there before but didn't work properly).

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9361 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 19:02:13 +00:00
ShA..Rd
960837fe02 NORMEN IS ALWAYS RIGHT 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9360 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 17:45:41 +00:00
ShA..Rd
2339b7d2e5 * Fix Material.hashCode/equals and RenderState.hashCode() 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9359 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 16:16:45 +00:00
sky..ok
a625e8ae2a Javadoc fixes R PHUN 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9358 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 15:11:38 +00:00
PSp..om
8bfe663402 Fixed the video recorder app state to attach itself 
to the last _enabled_ view instead of just the last
view.
Fixed the internal IsoTimer to report the proper
resolution.  It was reporting picoseconds when it
is actually returning milliseconds.  This manifested
itself as a stuck g_Time in my shaders because time
was creeping along so slowly (if at all... I'm not
sure float has enough resolution to measure 
1 / 1000000000 resolution.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9357 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 06:13:12 +00:00
nor..67
e52701f3e1 SDK: 
- Make SceneEditor Controller JmeRootNode final

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9356 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:56:11 +00:00
nor..67
352ee2083b SDK: 
- Make SceneEditor Controller good example of the async AWT/GL therading model of the SDK

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9355 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:55:01 +00:00
nor..67
77fc3e3eee SDK: 
- undo some changes due to shady threading raising its ugly head through the changes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9354 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:45:00 +00:00
nor..67
fa03a75cba SDK: 
- undo some changes due to shady threading raising its ugly head through the changes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9353 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-08 00:44:45 +00:00
nor..67
714484047b SDK: 
- remove some queueing to make tool selection update faster

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9352 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:29:58 +00:00
nor..67
eaf415cd80 SDK: 
- change back GLSL Editor version (all core plugin versions are unified)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9351 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:07:58 +00:00
nor..67
cf617fcae0 SDK: 
- catch all exceptions when adding/removing ant libraries in ProjectExtensionManager

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9350 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 23:06:56 +00:00
nor..67
92e2e35aef - change Material.equals to Material.contentEquals 
- update BatchNode, GeometryBatchFactory and Test

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9349 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 22:35:25 +00:00
sky..ok
f6ea856f9e GLObject/GLObjectManager -> NativeObject/NativeObjectManager in docs 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9348 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 17:12:59 +00:00
sky..ok
96e20aad8d Javadoc fixes: Down from 260 to 221 warnings 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9347 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 17:03:25 +00:00
dan..om
690915870c A whole lot of code formatting, unused import removal and other readability fixes. 
Syntax checking should now stop from generating errors with passed jME3 built-in vars. Those variables are only accepted used with "in" or "uniform".

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9346 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-07 16:09:50 +00:00
nor..67
cd010fa5e7 SDK: 
- change confusing error message

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9345 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-03 17:27:48 +00:00
Kae..pl
858c8ba9ba Fix to properties loading: properties are now stored in Spatial as basic types (supported by UserData) or Savables supported by jme core. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9344 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 18:03:40 +00:00
bre..ns
a5c8cb8ead option to flip texture's Y for skyFactory in SDK 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9343 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 17:33:38 +00:00
Kae..pl
f9593adee1 Fixed NPE error when using a single 'None' texture type in the material definition. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9342 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-02 16:45:38 +00:00
rem..om
2e704987b9 Fixed alpha variable declaration in SSAO Normal pass shader.Thanks to koris. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9341 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-01 19:16:11 +00:00
ShA..Rd
3d60482b46 * Fix paul complaining 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9340 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-01 14:19:12 +00:00
ShA..Rd
807a3e6fc5 * Fix incorrect format for DepthStencil in TextureUtil (fix potential GL issue) 
* Fix tex3DThumb.frag compile error (implicit int -> float conversion)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9339 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-05-01 14:15:39 +00:00
bre..ns
aeb231904a nav mesh generator remembers params and has tooltips now 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9338 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 22:19:59 +00:00
Kae..pl
2fe4d620d9 Fixing a bug where texture size getter is called before the opengl is initialized. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9337 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 17:37:59 +00:00
Kae..pl
b09e37c9d9 Added support for multilayered images. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9336 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 17:06:53 +00:00
Kae..pl
96cfd22510 Support for base texture blending for DDS textures. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9335 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 13:47:22 +00:00
rem..om
9d7d5a388c Shadows/SSAO and transparency : Removed the AlphaDiscardThreshold from the frag shaders 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9334 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 11:39:21 +00:00
Kae..pl
be9dc94d88 Removing unused folders. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9333 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 09:42:55 +00:00
Kae..pl
82c72f004f Removing unused folders. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9332 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 09:42:25 +00:00
Kae..pl
c4bf1b59a0 Removing @Override annotations from methods that implements interfaces (this will make the code Java 5 compatible). 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9331 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-30 09:34:22 +00:00
rem..om
22edb7beb0 Shadows/SSAO and transparency : Removed the AlphaDiscardThreshold attribute from the lighting material. Transparency discarding is now handled by the AlphaFallOff render state (as it should be). 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9330 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-29 20:32:08 +00:00
Kae..pl
8de8bf2d3e Textures loading refactoring. 
New features:
- support for loading both 2D and 3D textures (they are merged and flattened to Texture2D)
- support for colorband usage in flat textures
- support for using color factors for flat images

Bugfixes:
- blend texture should be now calculated properly at the ends of the object
- blend texture is now properly directed
- flat texture projection (flat, bude and tube) should now be properly directed

Other stuff:
- better code separation and improved readability

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9329 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-29 19:55:57 +00:00
bre..ns
f669290a3a updated terrainLighting.frag's shininess to match more of Lighting.frag 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9328 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-25 21:02:56 +00:00
bre..ns
a0af5de41e whoopsie, sorry TerrainGrid 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9327 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-24 20:27:41 +00:00
bre..ns
5dbde4ad06 TerrainQuad documentation patch thanks @slyh 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9326 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-24 20:17:25 +00:00
bre..ns
eac143830f TerrainGrid documentation patch thanks @slyh 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9325 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-24 20:14:19 +00:00
Kae..pl
b8896f3948 Added variable to BlenderKey that would allow to suspend object properties loading. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9324 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-24 12:54:10 +00:00
rem..om
1c92f500eb AndroidAudioRenderer : propperly set the looping value on media player 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9323 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-19 16:09:18 +00:00
ShA..Rd
ac59c1ffdf * Fix link error in glow material techniques 
* DesktopAssetManager now works as before (flipY and generate mips options are enabled)
 * Fix crash in TestSimpleWater

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9322 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-19 02:25:10 +00:00
Sha..rd
7ec115a768 * AssetManager now returns AudioData instead of AudioNode (similar to new Material() type behavior) 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9321 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-16 04:49:21 +00:00
Sha..rd
60e0e46344 * Remove usage of "SimpleTextured" shaders from other materials 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9320 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-15 21:20:37 +00:00
Sha..rd
9390125d6c * NativeObjectManager is now limited for 100 objects deleted per frame to reduce spikes with large heap config 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9319 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-15 19:38:39 +00:00
Sha..rd
0751d9ff76 * Added methods to DesktopAssetManager: addToCache/getFromCache/deleteFromCache/clearCache 
* Added new method to AssetCache interface to specify that registerAssetClone() won't be used (for the methods used above)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9318 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-15 18:30:04 +00:00
Sha..rd
c8fa79fbd6 * Fixed issue where an ogre3d animation with no tracks would load, but cause a NPE when loaded again from J3O 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9317 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-15 17:20:04 +00:00
Sha..rd
ad01d36915 * Added shader validation system. Requires either NVIDIA Cg or GPU Shader Analyser to be in the path. Run the ShaderCheck class to see which jME3 shaders fail validation. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9316 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-14 20:22:13 +00:00
Sha..rd
5d37b914e1 * Removed deprecated material definitions 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9315 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-14 20:19:13 +00:00
Sha..rd
2d12c4eaf8 * Fix compile error in TestPostWater 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9314 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-14 20:16:49 +00:00
Sha..rd
9c2257ff8e * Added TestCustomLoader example for asset manager 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9313 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-14 20:07:34 +00:00
Sha..rd
12d3e277e6 * Added new Jheora video system, however as advertised, audio will NOT work. If you want to try and fix it, go ahead. 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9312 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
 2012-04-14 20:05:56 +00:00