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

* Sorting ID now reset properly when shader or texture changed

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7377 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-05-01 04:48:10 +00:00
parent b5a8080f61
commit 3ed2824cc3
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engine/src/core/com/jme3/material/Material.java
View File

@ -377,21 +377,22 @@ public class Material implements Cloneable, Savable, Comparable<Material> {
name = checkSetParam(null, name); name = checkSetParam(null, name);
MatParamTexture val = getTextureParam(name); MatParamTexture val = getTextureParam(name);
if (val == null) { if (val == null)
throw new IllegalArgumentException("The given texture parameter is not set."); throw new IllegalArgumentException("The given texture parameter is not set.");
} else {
int texUnit = val.getUnit(); int texUnit = val.getUnit();
paramValues.remove(name); paramValues.remove(name);
nextTexUnit--; nextTexUnit--;
for (MatParam param : paramValues.values()) { for (MatParam param : paramValues.values()) {
if (param instanceof MatParamTexture) { if (param instanceof MatParamTexture) {
MatParamTexture texParam = (MatParamTexture) param; MatParamTexture texParam = (MatParamTexture) param;
if (texParam.getUnit() > texUnit) { if (texParam.getUnit() > texUnit) {
texParam.setUnit(texParam.getUnit() - 1); texParam.setUnit(texParam.getUnit() - 1);
}
} }
} }
} }
sortingId = -1;
} }
public void setTextureParam(String name, VarType type, Texture value) { public void setTextureParam(String name, VarType type, Texture value) {
@ -410,6 +411,9 @@ public class Material implements Cloneable, Savable, Comparable<Material> {
if (technique != null) { if (technique != null) {
technique.notifySetParam(name, type, nextTexUnit - 1); technique.notifySetParam(name, type, nextTexUnit - 1);
} }
// need to recompute sort ID
sortingId = -1;
} }
/** /**
@ -547,8 +551,7 @@ public class Material implements Cloneable, Savable, Comparable<Material> {
* @param lightList * @param lightList
*/ */
protected void updateLightListUniforms(Shader shader, Geometry g, int numLights) { protected void updateLightListUniforms(Shader shader, Geometry g, int numLights) {
if (numLights == 0) // this shader does not do lighting, ignore. if (numLights == 0){ // this shader does not do lighting, ignore.
{
return; return;
} }
@ -732,6 +735,9 @@ public class Material implements Cloneable, Savable, Comparable<Material> {
technique = tech; technique = tech;
tech.makeCurrent(def.getAssetManager()); tech.makeCurrent(def.getAssetManager());
// shader was changed
sortingId = -1;
} }
private void autoSelectTechnique(RenderManager rm) { private void autoSelectTechnique(RenderManager rm) {