30 Commits

Author SHA1 Message Date
Kirill Vainer
aba48495e1 J3MLoader: enforce MaterialKey requirements based on extension 2015-04-25 18:25:07 -04: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
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
shadowislord
550255b1d5 HttpZipLocator: fix unsupported exception on HTTPS URLs 2015-02-24 21:49:06 -05:00
shadowislord
02322d04cc J3MLoader: fix negative signs ("-") inside mat params
- Also move the "-LINEAR" directive to be associated with the parameter declaration instead of parameter default value
2015-02-24 20:36:24 -05:00
michael
1ad8ff154c Fixed uploading of all shader stages 2015-02-23 22:39:46 +01:00
michael
0d3292c83a Refactoring of the shader system to allow addition of new shaderstages 2015-02-23 19:59:11 +01:00
Nehon
3acd6b2f33 Fixed the error message when types/swizzles in a variable mapping do not match 2015-02-12 22:27:51 +01:00
shadowislord
629c007cd4 DDSLoader: fix loading 16-bit images (as exported by PVRTexTool) 2015-02-10 20:16:51 -05:00
shadowislord
8ae04fd1fb PlaceholderAssets: when assets fail to load, try to make the error appear visually 2015-02-10 20:10:43 -05:00
shadowislord
43fcd01114 Remove useless check against material technique name being called 'FixedFunc' 2015-02-01 17:17:05 -05:00
shadowislord
ad2a5366e1 WAVLoader now implements SeekableStream (but only if seeking to time = 0) 2014-11-16 13:02:51 -05:00
shadowislord
4717e7006f Goodbye, OpenGL1 2014-11-09 12:29:28 -05:00
shadowislord
62cfbc8a3e Remove usage of all deprecated image formats 2014-11-09 11:50:57 -05:00
shadowislord
b7ae8e6e3a Fix issue #127 2014-11-05 20:59:22 -05:00
shadowislord
be3a6c03b2 * Put comment markers around imported library contents when loading shader 2014-06-05 23:16:10 -04:00
shadowislord
65d83b37f0 * Deprecated LTC and LATC texture formats, OpenGL3+ does not support them. Instead RGTC / BC5 must be used.
* Add missing license to InstancedGeometry.
 * Minor cosmetic / doc changes.
2014-06-03 22:58:33 -04:00
shadowislord
99af4d9bd5 * Deprecate usage of TextureKey.setAsCube() and TextureKey.setAsTexture3D() - this is now handled by the TextureKey.setTextureTypeHint() method instead 2014-05-31 18:39:44 -04:00
shadowislord
6b12d5c638 * Fix many javadoc errors mostly related to incorrect HTML or missing references 2014-05-31 13:12:46 -04:00
Nehon
8ff6f8df24 Introduced a new Enum ColorSpace.
One can now mark a texture param in a material definition as linear by using -Linear at the end of the parameter declaration (case insensitive).
An Image bound to a material texture param in a linear color space will have its ColorSpace set to linear when bound to the material by mat.setTexture("name", texture);
Added the -LINEAR flag to all texture param that needed it in stock materials (lighting.j3md, terrainLighting.j3md, different Filter materials).
2014-05-26 12:11:57 +02:00
Nehon
e4ba4e9e9e - Image loaders now assume ALL images are in sRGB space and set the flag accordingly
- All images constructors now take the isSrgb flag as a parameter, all engine classes has been changed to accommodate the change, old constructors has been deprecated for backward compatibility. One should always ask himself in which color space is an image if dealing with gamma correction
- Gamma correction has been defaulted to false in the appSettings
2014-05-26 12:11:56 +02:00
Normen Hansen
a16857c8f4 switch to gradle layout 2014-03-21 02:32:11 +01:00