Skip to content

Commit ec9f810

Browse files
shadowislordshadowislord
committed
Merge pull request jMonkeyEngine#467 from jMonkeyEngine/tdl-mpo
TDL/MPO
2 parents b4d295e + a4b65ec commit ec9f810

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3987
-1621
lines changed

‎.gitignore‎

Lines changed: 13 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
1+
**/nbproject/private/
12
/.gradle/
2-
/.nb-gradle/private/
3-
/.nb-gradle/profiles/private/
3+
/.nb-gradle/
44
/.idea/
55
/dist/
66
/build/
7+
/bin/
78
/netbeans/
8-
/sdk/jdks/local/
9-
/jme3-core/build/
9+
/.classpath
10+
/.project
11+
/.settings
12+
*.dll
13+
*.so
14+
*.jnilib
15+
*.dylib
16+
*.iml
17+
.DS_Store
1018
/jme3-core/src/main/resources/com/jme3/system/version.properties
11-
/jme3-plugins/build/
12-
/jme3-desktop/build/
13-
/jme3-android-native/build/
14-
/jme3-android/build/
15-
/jme3-android-examples/build/
16-
/jme3-blender/build/
17-
/jme3-effects/build/
18-
/jme3-bullet/build/
19-
/jme3-terrain/build/
20-
/jme3-bullet-native/build/
21-
/jme3-bullet-native-android/build/
22-
/jme3-jogg/build/
23-
/jme3-jbullet/build/
24-
/jme3-lwjgl/build/
25-
/jme3-networking/build/
26-
/jme3-niftygui/build/
27-
/jme3-testdata/build/
28-
/jme3-examples/build/
29-
/jme3-jogl/build/
30-
/jme3-ios/build/
31-
/jme3-gl-autogen/build/
19+
/jme3-*/build/
3220
/jme3-bullet-native/bullet.zip
3321
/jme3-bullet-native/bullet-2.82-r2704/
3422
/jme3-android-native/openal-soft/
@@ -38,113 +26,9 @@
3826
/jme3-android-native/src/native/jme_decode/com_jme3_audio_plugins_NativeVorbisFile.h
3927
/jme3-android-native/src/native/jme_decode/com_jme3_texture_plugins_AndroidNativeImageLoader.h
4028
/jme3-android-native/stb_image.h
41-
/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip
42-
/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip
43-
/sdk/jme3-project-testdata/release/
44-
/sdk/JME3TestsTemplateAndroid/src/jme3test/
45-
/sdk/JME3TestsTemplate/src/jme3test/
46-
/sdk/build/
47-
/sdk/jme3-core-baselibs/release/
48-
/sdk/jme3-core-libraries/release/
49-
/sdk/jme3-project-baselibs/release/
50-
/sdk/jme3-project-libraries/release/
51-
/sdk/jme3-codepalette/build/
52-
/sdk/jme3-core-libraries/build/
53-
/sdk/jme3-code-check/build/
54-
/sdk/jme3-core-baselibs/build/
55-
/sdk/jme3-documentation/build/
56-
/sdk/jme3-core-updatecenters/build/
57-
/sdk/jme3-project-testdata/build/
58-
/sdk/jme3-project-libraries/build/
59-
/sdk/jme3-project-baselibs/build/
60-
/sdk/jme3-templates/build/
61-
/sdk/jme3-texture-editor/build/
62-
/sdk/jme3-tests-template/build/
63-
/sdk/jme3-upgrader/build/
64-
/sdk/jme3-core/build/
65-
/sdk/jme3-obfuscate/build/
66-
/sdk/jme3-gui/build/
67-
/sdk/jme3-cinematics/build/
68-
/sdk/jme3-terrain-editor/build/
69-
/sdk/jme3-lwjgl-applet/build/
70-
/sdk/jme3-blender/build/
71-
/sdk/jme3-navmesh-gen/build/
72-
/sdk/jme3-angelfont/build/
73-
/sdk/jme3-materialeditor/build/
74-
/sdk/jme3-android/build/
75-
/sdk/jme3-desktop-executables/build/
76-
/sdk/jme3-ogrexml/build/
77-
/sdk/jme3-ogretools/build/
78-
/sdk/jme3-scenecomposer/build/
79-
/sdk/jme3-assetpack-support/build/
80-
/sdk/jme3-model-importer/build/
81-
/sdk/jme3-wavefront/build/
82-
/sdk/jme3-vehicle-creator/build/
83-
/sdk/jme3-welcome-screen/build/
84-
/sdk/jme3-glsl-support/build/
85-
/sdk/jme3-dark-laf/build/
86-
/sdk/nbproject/private/
87-
/sdk/jme3-scenecomposer/nbproject/private/
88-
/sdk/jme3-core/nbproject/private/
89-
/sdk/jme3-core-baselibs/nbproject/private/
90-
/sdk/jme3-welcome-screen/nbproject/private/
91-
/sdk/jme3-lwjgl-applet/nbproject/private/
92-
/sdk/jme3-ogrexml/nbproject/private/
93-
/sdk/jme3-upgrader/nbproject/private/
94-
/sdk/jme3-obfuscate/nbproject/private/
95-
/sdk/jme3-navmesh-gen/nbproject/private/
96-
/sdk/jme3-wavefront/nbproject/private/
97-
/sdk/jme3-project-libraries/nbproject/private/
98-
/sdk/jme3-ogretools/nbproject/private/
99-
/sdk/jme3-assetpack-support/nbproject/private/
100-
/sdk/jme3-cinematics/nbproject/private/
101-
/sdk/jme3-model-importer/nbproject/private/
102-
/sdk/jme3-desktop-executables/nbproject/private/
103-
/sdk/jme3-glsl-support/nbproject/private/
104-
/sdk/jme3-android/nbproject/private/
105-
/sdk/jme3-angelfont/nbproject/private/
106-
/sdk/jme3-codepalette/nbproject/private/
107-
/sdk/jme3-documentation/nbproject/private/
108-
/sdk/jme3-vehicle-creator/nbproject/private/
109-
/sdk/jme3-code-check/nbproject/private/
110-
/sdk/jme3-blender/nbproject/private/
111-
/sdk/jme3-core-libraries/nbproject/private/
112-
/sdk/jme3-core-updatecenters/nbproject/private/
113-
/sdk/jme3-gui/nbproject/private/
114-
/sdk/jme3-materialeditor/nbproject/private/
115-
/sdk/jme3-project-baselibs/nbproject/private/
116-
/sdk/jme3-project-testdata/nbproject/private/
117-
/sdk/jme3-templates/nbproject/private/
118-
/sdk/jme3-terrain-editor/nbproject/private/
119-
/sdk/jme3-tests-template/nbproject/private/
120-
/sdk/jme3-texture-editor/nbproject/private/
121-
/sdk/JME3TestsTemplate/nbproject/private/
122-
/sdk/JME3TestsTemplateAndroid/nbproject/private/
123-
/bin
124-
/.classpath
125-
/.project
126-
/.settings
127-
*.dll
128-
*.so
129-
*.jnilib
130-
*.dylib
131-
*.iml
132-
.DS_Store
133-
/sdk/dist/
13429
!/jme3-bullet-native/libs/native/windows/x86_64/bulletjme.dll
13530
!/jme3-bullet-native/libs/native/windows/x86/bulletjme.dll
13631
!/jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib
13732
!/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib
13833
!/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so
13934
!/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so
140-
/.nb-gradle/
141-
/sdk/ant-jme/nbproject/private/
142-
/sdk/nbi/stub/ext/engine/nbproject/private/
143-
/sdk/nbi/stub/ext/components/products/jdk/nbproject/private/
144-
/sdk/nbi/stub/ext/components/products/blender/nbproject/private/
145-
/sdk/nbi/stub/ext/components/products/helloworld/nbproject/private/
146-
/sdk/BasicGameTemplate/nbproject/private/
147-
/sdk/nbi/stub/ext/components/products/jdk/build/
148-
/sdk/nbi/stub/ext/components/products/jdk/dist/
149-
/sdk/jme3-dark-laf/nbproject/private/
150-
jme3-lwjgl3/build/

‎common.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ javadoc {
5151
}
5252
}
5353

54+
test {
55+
testLogging {
56+
exceptionFormat = 'full'
57+
}
58+
}
59+
5460
task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') {
5561
classifier = 'sources'
5662
from sourceSets*.allSource

‎jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public class SkeletonControl extends AbstractControl implements Cloneable, JmeCl
111111
* Material references used for hardware skinning
112112
*/
113113
private Set<Material> materials = new HashSet<Material>();
114-
114+
115115
/**
116116
* Serialization only. Do not use.
117117
*/
@@ -204,6 +204,9 @@ public boolean isHardwareSkinningUsed() {
204204
* @param skeleton the skeleton
205205
*/
206206
public SkeletonControl(Skeleton skeleton) {
207+
if (skeleton == null) {
208+
throw new IllegalArgumentException("skeleton cannot be null");
209+
}
207210
this.skeleton = skeleton;
208211
}
209212

‎jme3-core/src/main/java/com/jme3/asset/AssetManager.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
import com.jme3.renderer.Caps;
4242
import com.jme3.scene.Spatial;
4343
import com.jme3.scene.plugins.OBJLoader;
44-
import com.jme3.shader.Shader;
4544
import com.jme3.shader.ShaderGenerator;
46-
import com.jme3.shader.ShaderKey;
4745
import com.jme3.texture.Texture;
4846
import com.jme3.texture.plugins.TGALoader;
4947
import java.io.IOException;
@@ -320,13 +318,6 @@ public interface AssetManager {
320318
*/
321319
public Material loadMaterial(String name);
322320

323-
/**
324-
* Loads shader file(s), shouldn't be used by end-user in most cases.
325-
*
326-
* @see AssetManager#loadAsset(com.jme3.asset.AssetKey)
327-
*/
328-
public Shader loadShader(ShaderKey key);
329-
330321
/**
331322
* Load a font file. Font files are in AngelCode text format,
332323
* and are with the extension "fnt".

‎jme3-core/src/main/java/com/jme3/asset/DesktopAssetManager.java‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
package com.jme3.asset;
3333

3434
import com.jme3.asset.cache.AssetCache;
35-
import com.jme3.asset.cache.SimpleAssetCache;
3635
import com.jme3.audio.AudioData;
3736
import com.jme3.audio.AudioKey;
3837
import com.jme3.font.BitmapFont;
@@ -42,9 +41,7 @@
4241
import com.jme3.scene.Spatial;
4342
import com.jme3.shader.Glsl100ShaderGenerator;
4443
import com.jme3.shader.Glsl150ShaderGenerator;
45-
import com.jme3.shader.Shader;
4644
import com.jme3.shader.ShaderGenerator;
47-
import com.jme3.shader.ShaderKey;
4845
import com.jme3.system.JmeSystem;
4946
import com.jme3.texture.Texture;
5047
import java.io.IOException;
@@ -431,36 +428,6 @@ public FilterPostProcessor loadFilter(String name){
431428
return loadFilter(new FilterKey(name));
432429
}
433430

434-
/**
435-
* Load a vertex/fragment shader combo.
436-
*
437-
* @param key
438-
* @return the loaded {@link Shader}
439-
*/
440-
public Shader loadShader(ShaderKey key){
441-
// cache abuse in method
442-
// that doesn't use loaders/locators
443-
AssetCache cache = handler.getCache(SimpleAssetCache.class);
444-
Shader shader = (Shader) cache.getFromCache(key);
445-
if (shader == null){
446-
if (key.isUsesShaderNodes()) {
447-
if(shaderGenerator == null){
448-
throw new UnsupportedOperationException("ShaderGenerator was not initialized, make sure assetManager.getGenerator(caps) has been called");
449-
}
450-
shader = shaderGenerator.generateShader();
451-
} else {
452-
shader = new Shader();
453-
shader.initialize();
454-
for (Shader.ShaderType shaderType : key.getUsedShaderPrograms()) {
455-
shader.addSource(shaderType,key.getShaderProgramName(shaderType),(String) loadAsset(new AssetKey(key.getShaderProgramName(shaderType))),key.getDefines().getCompiled(),key.getShaderProgramLanguage(shaderType));
456-
}
457-
}
458-
459-
cache.addToCache(key, shader);
460-
}
461-
return shader;
462-
}
463-
464431
/**
465432
* {@inheritDoc}
466433
*/

‎jme3-core/src/main/java/com/jme3/material/MatParam.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.jme3.asset.TextureKey;
3535
import com.jme3.export.*;
3636
import com.jme3.math.*;
37-
import com.jme3.renderer.Renderer;
3837
import com.jme3.shader.VarType;
3938
import com.jme3.texture.Texture;
4039
import com.jme3.texture.Texture.WrapMode;
@@ -129,9 +128,6 @@ public void setValue(Object value) {
129128
this.value = value;
130129
}
131130

132-
void apply(Renderer r, Technique technique) {
133-
technique.updateUniformParam(getPrefixedName(), getVarType(), getValue());
134-
}
135131

136132
/**
137133
* Returns the material parameter value as it would appear in a J3M

0 commit comments

Comments
 (0)