69 Commits

Author SHA1 Message Date
Nehon
4777c591b1 GLSLLoader now moves all extensions declaration found in the dependencies at the top of the shader code 2017-01-14 23:13:08 +01:00
Nehon
16023fa481 PBR has come
Merge branch 'PBRisComing'

# Conflicts:
#	jme3-core/src/main/java/com/jme3/material/Material.java
#	jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
2016-07-07 20:36:31 +02:00
Dokthar
a52a51cb27 typo fix in materials & shaders, also fix some javadoc 2016-05-11 22:56:57 +02:00
Kirill Vainer
e71cf81b96 J3M: allow static pass lighting to be selected 2016-04-20 16:40:11 -04:00
Nehon
f70151f2c7 Merge branch 'master' into PBRisComing 2016-04-15 20:17:26 +02:00
Nehon
c859cf375c Fixed an issue with shaderNodes loading 2016-04-11 20:19:16 +02:00
Nehon
c7d264fe8e Merge branch 'master' into PBRisComing
# Conflicts:
#	jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
2016-04-11 19:09:52 +02:00
Kirill Vainer
cb61e760ce Merge branch 'master' into BorealFeast-master
Conflicts:
	jme3-core/src/main/java/com/jme3/material/RenderState.java
	jme3-core/src/main/java/com/jme3/renderer/opengl/GL.java
2016-04-10 12:51:19 -04:00
Kirill Vainer
8bd5b59a0e material: warn / ignore fixed function techniques 2016-04-10 12:16:35 -04:00
Kirill Vainer
b6729c46d4 code / comment cleanup 2016-04-10 12:15:01 -04:00
Kirill Vainer
876015ab47 deprecate alpha test / point sprite 2016-04-10 12:09:36 -04:00
Teencrusher
d1aae8d479 Added support to glBlendEquation for renderes implementing GL2, and material loading support 2016-04-06 13:56:13 -04:00
Nehon
0ec2263ae9 Merged master into PBR and migrated to TechniqueDefLogic 2016-04-05 21:51:26 +02:00
Kirill Vainer
280733c1ce material: move technique logic into its own package 2016-04-02 15:04:45 -04:00
Kirill Vainer
9d035f747a Add the new material system
Also includes some unrelated tests

Conflicts:
	jme3-core/src/main/java/com/jme3/renderer/RenderManager.java
	jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
2016-04-02 14:57:10 -04:00
Jan Ivenz
98a9f5c628 Fixed shader generation bug for array variables. 2016-03-30 21:58:27 +02:00
Nehon
754c256a66 Merge branch 'master' into PBRisComing 2016-03-25 23:50:19 +01:00
Nehon
493855bac9 LineWidth is now a RenderState parameter, One can change the lineWidth used to render a mesh wireframe or a mesh in Lines mode by using material.getAdditionalRenderState().setLineWidth(value) 2016-03-20 21:36:28 +01:00
Nehon
cb56fd88eb For some reason the J3MLoader never loads the material name. Not that it's really important, but since we have the name field... let's read it... 2016-03-11 17:45:29 +01:00
Daniel Johansson
9f9cb824cd Fixed an issue with J3MLoader thinking certain texture path patterns with new texture options still looked like old style and hence ignoring new options and getting the texture path wrong. 2016-03-07 16:38:43 +00:00
Nehon
cedb4d3c3e Merge branch 'master' into PBRisComing 2015-11-20 09:00:23 +01:00
Nehon
50a9a8636b HDRLoader, reverted the change that loaded the HDR files in sRGB space, since the specs says that data is in linear space for this format. 2015-11-20 08:59:42 +01:00
Nehon
aa067ef60d Merge branch 'master' into PBRisComing 2015-11-17 14:55:36 +01:00
Nehon
ad4634ce04 .hdr files are now loaded in sRGB color space as there is no reason it should be loaded in linear space. 2015-11-17 14:54:59 +01:00
Rémy Bouquet
c47da8e9a1 Merge branch 'master' into PBRisComing
* master: (94 commits)
  First attempt to fix a bug reported by david_bernard_31, the size of the strings in the shader code was wrongly computed for the JOGL backend
  Allows to choose between the forward compatible profile and the backward compatible profile in the JOGL backend
  Displays the JOGL version instead of the NEWT version
  Updates JOGL (2.3.2)
  Bugfix: fix to importing blend files with linked content.
  native loader: set lwjgl library path for lwjgl3
  Updated lwjgl3 module to use LWJGL 3.0.0b #35 which is the current stable build.
  Change duplicated docstring in FlyByCamera.unregisterInput
  light : fixed pointLight v. bounding sphere unit test
  light : replaced duplicated code by methods from Intersection
  Removed native library jemalloc.dll for LWJGL3 as this will not be needed until 3.0.0b and after.
  light : added unit tests for the new support of bounding spheres intersections (for lightFilter)
  Fixed Issue #46 : The MaterialViewer will now simply ignore not available textures instead of crashing
  Lights (see #362) : added light v. sphere intersection, and implementations of intersectsSphere(), second attempt
  GImpactCollisionShape : fix for #188, added a call to updateBound() in native jni binding, just after creating the shape, (native createShape() method)
  Bugfix: fixed a bug that caused importer to crash when the author of the blend file assigned non existing UV coordinates group name to a mesh.
  Bugfix: fixed a bug that caused subdivision surface modifier to crash if at least one not connected vertex was in the mesh.
  The LWJGL 3 renderer was missing a call to GLContext.createFromCurrent(), sorted now.
  Changed the default app title in AppSettings to use the full name string from JmeVersion. This way no more manual changing of this will be needed for future versions. This also closes #320 which highlighted this issue. Thanks @8Keep.
  Fixed #316 where some post processing effects were not working when using OPENGL_3 renderer due to an error in the fragment shader.
  ...
2015-11-02 11:28:07 +01:00
Daniel Johansson
d319a7c5d3 Added unit test for J3MLoader to cover the new texture parameters available in #295. Also fixed a couple of issues in the code to reduce logging that was not needed and removed redundant code. This update also updates junit to 4.12 and adds Mockito and Fest Assertions as test dependencies. 2015-07-20 11:22:16 +01:00
Daniel Johansson
9059eb30e4 Added support for setting minification and magnification filters on a texture in the j3m material file. This also adds support for double and single quoted paths as well as being able to set WrapMode for a specific WrapAxis. This resolves #295 2015-07-14 22:28:13 +01:00
Nehon
327e0125d9 Merge branch 'master' into PBRisComing
Conflicts:
	jme3-core/src/main/java/com/jme3/material/Material.java
	jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
2015-07-11 21:34:30 +02:00
Nehon
be58be75ef Merge branch 'master' into PBRisComing 2015-07-03 23:34:26 +02:00
David Bernard
fe72dd67dd add TechniqueDef.noRender 2015-07-03 20:49:20 +02:00
Riccardo Balbo
7fa735fdb1 Remove root slash from the asset path 2015-06-18 16:26:36 +02:00
Nehon
0594e5dc7e Merge branch 'master' into PBRisComing 2015-05-05 18:05:07 +02:00
Kirill Vainer
0178029782 Example to show character model cloning / export 2015-05-03 16:02:25 -04:00
Kirill Vainer
b4baaadc79 JmeExporter: remove useless return 2015-05-03 15:59:32 -04:00
Kirill Vainer
10cde0a4b2 DXTFlipper: fix incorrect flipping of DXT5 images of size 2x2
For DXT1/3 images, the format for color and alpha blocks is the same,
so the bug would not appear. For DXT5 images, the alpha block is formatted
differently. The issue is that it flips the color block and then the alpha
block for 2x2 images, but the correct order is alpha block then color block.
2015-04-25 22:42:20 -04:00
Kirill Vainer
aba48495e1 J3MLoader: enforce MaterialKey requirements based on extension 2015-04-25 18:25:07 -04: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
fdf050c13d J3MLoader: set texture name in addition to key when loading it 2015-03-27 21:38:56 -04:00
shadowislord
400c09a633 jme3-core: fix minor issues pointed in static analysis 2015-03-27 21:33:29 -04:00
Nehon
8a96772ae3 KTX file loading and writing support 2015-03-25 23:18:19 +01:00
Nehon
7ab9798ad7 J3MLoader can now read the LightSpace attribute 2015-03-21 12:08:07 +01:00
michael
5b58bda23f Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine into GL4ShaderSupport
Conflicts:
	jme3-core/src/main/resources/com/jme3/asset/Desktop.cfg
2015-03-01 09:48:36 +01:00
shadowislord
a7765cfb63 com.jme3.asset.plugins: javadoc additions 2015-02-28 16:39:12 -05:00
michael
99d69d1d01 Fixed formatting thanks to EmpirePhoenix 2015-02-28 16:45:18 +01:00
michael
a59f017710 Removed two sysouts 2015-02-28 14:02:50 +01:00
michael
273ad711bf Fixed Typo 2015-02-28 13:43:07 +01:00
michael
6983aff1f3 *Reapplied -LINEAR fix from 02322d04cc 2015-02-28 10:55:40 +01:00
michael
9e74c4e2bb *reverted J3MLoader 2015-02-28 10:38:17 +01:00
michael
f64eb5ff09 *merge from upstream 2015-02-28 10:29:14 +01:00