sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Blender now supports loading color for shadeless materials

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9006 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-01-08 23:46:57 +00:00
parent 3478012756
commit 03fb684b10
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
View File

@ -69,7 +69,12 @@ public final class MaterialContext {
diffuseShader = DiffuseShader.values()[diff_shader]; diffuseShader = DiffuseShader.values()[diff_shader];
if(this.shadeless) { if(this.shadeless) {
diffuseColor = ColorRGBA.White.clone(); float r = ((Number) structure.getFieldValue("r")).floatValue();
float g = ((Number) structure.getFieldValue("g")).floatValue();
float b = ((Number) structure.getFieldValue("b")).floatValue();
float alpha = ((Number) structure.getFieldValue("alpha")).floatValue();
diffuseColor = new ColorRGBA(r, g, b, alpha);
specularShader = null; specularShader = null;
specularColor = ambientColor = null; specularColor = ambientColor = null;
shininess = 0.0f; shininess = 0.0f;

6
engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
View File

@ -241,6 +241,12 @@ public class MaterialHelper extends AbstractBlenderHelper {
} else { } else {
if (materialContext.shadeless) { if (materialContext.shadeless) {
result = new Material(blenderContext.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md"); result = new Material(blenderContext.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
if (!materialContext.transparent) {
materialContext.diffuseColor.a = 1;
}
result.setColor("Color", materialContext.diffuseColor);
} else { } else {
result = new Material(blenderContext.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); result = new Material(blenderContext.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
result.setBoolean("UseMaterialColors", Boolean.TRUE); result.setBoolean("UseMaterialColors", Boolean.TRUE);