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

Merge branch 'updateGeometricStateOptimization' of https://github.com/Bebul/jmonkeyengine

Browse Source
This commit is contained in:
shadowislord 2014-12-05 18:46:55 -05:00
commit 10ee96d839
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jme3-core/src/main/java/com/jme3/scene/Node.java
View File

@ -114,6 +114,16 @@ public class Node extends Spatial implements Savable {
child.setLightListRefresh(); child.setLightListRefresh();
} }
Spatial p = parent;
while (p != null) {
if (p.refreshFlags != 0) {
return; //any refresh flag is sufficient, as each propagates to the root Node
}
p.refreshFlags |= RF_CHILD_LIGHTLIST;
p = p.parent;
}
} }
@Override @Override
@ -154,6 +164,9 @@ public class Node extends Spatial implements Savable {
@Override @Override
public void updateGeometricState(){ public void updateGeometricState(){
boolean somethingToRefresh = (refreshFlags != 0);
if (!somethingToRefresh) return;
if ((refreshFlags & RF_LIGHTLIST) != 0){ if ((refreshFlags & RF_LIGHTLIST) != 0){
updateWorldLightList(); updateWorldLightList();
} }
@ -164,6 +177,7 @@ public class Node extends Spatial implements Savable {
updateWorldTransforms(); updateWorldTransforms();
} }
refreshFlags &= ~RF_CHILD_LIGHTLIST;
if (!children.isEmpty()) { if (!children.isEmpty()) {
// the important part- make sure child geometric state is refreshed // the important part- make sure child geometric state is refreshed
// first before updating own world bound. This saves // first before updating own world bound. This saves
@ -638,5 +652,4 @@ public class Node extends Spatial implements Savable {
protected void breadthFirstTraversal(SceneGraphVisitor visitor, Queue<Spatial> queue) { protected void breadthFirstTraversal(SceneGraphVisitor visitor, Queue<Spatial> queue) {
queue.addAll(children); queue.addAll(children);
} }
} }

3
jme3-core/src/main/java/com/jme3/scene/Spatial.java
View File

@ -118,7 +118,8 @@ public abstract class Spatial implements Savable, Cloneable, Collidable, Cloneab
*/ */
protected static final int RF_TRANSFORM = 0x01, // need light resort + combine transforms protected static final int RF_TRANSFORM = 0x01, // need light resort + combine transforms
RF_BOUND = 0x02, RF_BOUND = 0x02,
RF_LIGHTLIST = 0x04; // changes in light lists RF_LIGHTLIST = 0x04, // changes in light lists
RF_CHILD_LIGHTLIST = 0x08; // some child need geometry update
protected CullHint cullHint = CullHint.Inherit; protected CullHint cullHint = CullHint.Inherit;
protected BatchHint batchHint = BatchHint.Inherit; protected BatchHint batchHint = BatchHint.Inherit;