Nehon
|
8e9148f95f
|
Fix for previous too optimistic merge
|
2015-04-11 16:14:54 +02:00 |
|
Nehon
|
e1d0e06c59
|
Merge branch 'master' into PBRisComing
Conflicts:
jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
|
2015-04-11 16:01:01 +02:00 |
|
Nehon
|
81c995edc4
|
PBR shader and PBR test case with custom model
|
2015-04-11 15:37:05 +02:00 |
|
shadowislord
|
36493353c9
|
TechniqueDef: fix caps loading for shader language versions
|
2015-03-29 11:47:58 -04:00 |
|
Nehon
|
3135f2f4bf
|
Added utilities class to compute the Irradiance Map, and Prefiltered Environment Map needed for PBR indirect lighting.
|
2015-03-28 15:30:08 +01:00 |
|
shadowislord
|
414e1b3fff
|
Lighting.glsllib: Use quadratic spotlight falloff in SRGB mode
|
2015-03-27 23:34:53 -04:00 |
|
shadowislord
|
26109fcbac
|
(SP)Lighting.vert: clarify comment regarding material colors
|
2015-03-27 22:19:02 -04:00 |
|
shadowislord
|
6252258c98
|
TechniqueDef: remove useless usesShaders variable
|
2015-03-27 21:55:32 -04:00 |
|
shadowislord
|
fa324cad8f
|
Dome: fix crash when center = null
|
2015-03-27 21:49:59 -04:00 |
|
shadowislord
|
26f702cc91
|
GLTracer: add more no-enum methods
|
2015-03-27 21:49:33 -04:00 |
|
shadowislord
|
a3467def1e
|
WeakRefCloneAssetCache: remove useless "synchronized" (the map is already thread-safe)
|
2015-03-27 21:48:24 -04:00 |
|
shadowislord
|
06408410cf
|
CollisionResult: add hashCode() - required if we have equals()
|
2015-03-27 21:47:54 -04:00 |
|
shadowislord
|
305e56a921
|
ShaderNode: remove incorrect attribution
|
2015-03-27 21:47:21 -04:00 |
|
shadowislord
|
068047200e
|
Threads: standardize names. Make sure they all start with "jME3".
|
2015-03-27 21:43:32 -04:00 |
|
shadowislord
|
a683fbb16c
|
Texture: allow setting aniso = 0, since that's the default anyway
|
2015-03-27 21:39:27 -04:00 |
|
shadowislord
|
fdf050c13d
|
J3MLoader: set texture name in addition to key when loading it
|
2015-03-27 21:38:56 -04:00 |
|
shadowislord
|
f0fbdffb85
|
BoundingSphere: remove useless null check
|
2015-03-27 21:38:14 -04:00 |
|
shadowislord
|
4f15fa3147
|
AnimChannel: remove useless println
|
2015-03-27 21:37:50 -04:00 |
|
shadowislord
|
400c09a633
|
jme3-core: fix minor issues pointed in static analysis
|
2015-03-27 21:33:29 -04:00 |
|
Kirill Vainer
|
1076b489ab
|
GLRenderer: remove check FB error calls as it causes GPU stall
|
2015-03-26 17:03:04 -04:00 |
|
Nehon
|
8a96772ae3
|
KTX file loading and writing support
|
2015-03-25 23:18:19 +01:00 |
|
jmekaelthas
|
eb767e7580
|
Feature: added support for loading assets linked from external blender
files.
|
2015-03-23 20:09:45 +01:00 |
|
Nehon
|
cecf355c70
|
SinglePass now uses the TechniqueDef LightSpace.
The single pass material definition LightSpace has been set to View until we implement it in world space.
|
2015-03-21 12:10:43 +01:00 |
|
Nehon
|
d662eadce9
|
LightSpace is now defaulted to World for SinglePass
|
2015-03-21 12:09:06 +01:00 |
|
Nehon
|
7ab9798ad7
|
J3MLoader can now read the LightSpace attribute
|
2015-03-21 12:08:07 +01:00 |
|
Nehon
|
01ed6db77c
|
Introduced a LightSpace attribute in the TechniqueDef to define in what space LightData should be sent to the shader. Used it for the multipass lighting
|
2015-03-21 10:36:00 +01:00 |
|
shadowislord
|
a37f38a412
|
Build: fix build failure if not building from git repo
|
2015-03-20 23:51:15 -04:00 |
|
shadowislord
|
a157e83815
|
GLRenderer: always use glGenerateMipmap if we have FBO support
|
2015-03-18 23:21:25 -04:00 |
|
shadowislord
|
3a83ab4c69
|
GLRenderer: applied 080255f51860d6803b88c0c91206a0c6c42da5f4 to FrameBuffer textures as well
|
2015-03-18 23:19:43 -04:00 |
|
shadowislord
|
d6a19c4c66
|
Lighting.j3md: remove fixed function bindings
|
2015-03-18 23:16:48 -04:00 |
|
shadowislord
|
c0e85b3255
|
MaterialDebug: remove DesktopAssetManager dependency
|
2015-03-18 23:15:57 -04:00 |
|
shadowislord
|
784cfddb21
|
Filter: minor javadoc mistake
|
2015-03-18 23:14:01 -04:00 |
|
shadowislord
|
c34fcce7a2
|
MatParamTexture: remove useless constructor
|
2015-03-18 23:13:09 -04:00 |
|
shadowislord
|
6d7da0cc4e
|
AssetManager: use right exception class if no loaders registered
|
2015-03-18 23:11:39 -04:00 |
|
Nehon
|
080255f518
|
Fixed issue #243 about TextureArrays
|
2015-03-18 22:30:07 +01:00 |
|
shadowislord
|
a2fc435167
|
SPLighting: fix issue #239
|
2015-03-09 22:22:55 -04:00 |
|
shadowislord
|
8466b25c6b
|
ALAudioRenderer: fix issue #244
|
2015-03-09 22:20:54 -04:00 |
|
Nehon
|
7c5f994db8
|
Removed one assertion in AlAudioRenderer as it can't pass considering the current AudioNode implementation
|
2015-03-09 22:20:19 +01:00 |
|
Nehon
|
9e4f418427
|
Fixed an assertion error in BatchNode updating
|
2015-03-09 20:41:31 +01:00 |
|
David Bernard
|
a19246973c
|
build: enable assertion for test and run (previously only test as assertionEnabled = true)
|
2015-03-06 10:47:04 +01:00 |
|
Nehon
|
40905061b5
|
Fixed an issue in TechniqueDef due to recent Geom and tesselation shader addition
|
2015-03-05 18:49:32 +01:00 |
|
David Bernard
|
f8a7117e0f
|
fix a NPE and a ClassCastExcpetion on Cinematic.clear()
|
2015-03-05 10:56:14 +01:00 |
|
Nehon
|
d6c6884066
|
Removed code duplication in BatchNode
|
2015-03-03 22:52:52 +01:00 |
|
Rémy Bouquet
|
46c00c95b3
|
Merge pull request #226 from jMonkeyEngine/pr/223
Obsolete shadowRecv and sceneReceivers code cleanup
|
2015-03-03 22:35:25 +01:00 |
|
Nehon
|
1616b08c5b
|
Fixed issue when BatchNode's light list flag was not cleared
|
2015-03-03 22:11:17 +01:00 |
|
Rémy Bouquet
|
d74d5e6ca9
|
Merge pull request #154 from abies/master
Speedup for TangengBinormalGenerator
|
2015-03-03 21:48:37 +01:00 |
|
michael
|
b727d5998e
|
Fixed the swapped bits for Control and Evaluation Shader
|
2015-03-03 12:34:25 +01:00 |
|
Bebul
|
8c37778749
|
Obsolete shadowRecv and sceneReceivers code cleanup
|
2015-03-03 08:46:10 +01:00 |
|
Nehon
|
dead648e34
|
Fixed NPE in ShaderKey when using ShaderNodes.
|
2015-03-02 20:31:48 +01:00 |
|
Kirill Vainer
|
273f3a6e62
|
Merge pull request #220 from zzuegg/master
Geometry shader and Tessellation shader support
|
2015-03-02 10:01:08 -05:00 |
|