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

Minor cleanup for previous merge

Browse Source
This commit is contained in:
shadowislord 2014-12-05 21:09:55 -05:00
parent 10ee96d839
commit 798ec94b11
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,15 +115,18 @@ public class Node extends Spatial implements Savable {
child.setLightListRefresh(); child.setLightListRefresh();
} }
// Make sure next updateGeometricState() visits this branch
// to update lights.
Spatial p = parent; Spatial p = parent;
while (p != null) { while (p != null) {
if (p.refreshFlags != 0) { if (p.refreshFlags != 0) {
return; //any refresh flag is sufficient, as each propagates to the root Node // any refresh flag is sufficient,
// as each propagates to the root Node
return;
} }
p.refreshFlags |= RF_CHILD_LIGHTLIST; p.refreshFlags |= RF_CHILD_LIGHTLIST;
p = p.parent; p = p.parent;
} }
} }
@Override @Override
@ -164,8 +167,10 @@ public class Node extends Spatial implements Savable {
@Override @Override
public void updateGeometricState(){ public void updateGeometricState(){
boolean somethingToRefresh = (refreshFlags != 0); if (refreshFlags == 0) {
if (!somethingToRefresh) return; // This branch has no geometric state that requires updates.
return;
}
if ((refreshFlags & RF_LIGHTLIST) != 0){ if ((refreshFlags & RF_LIGHTLIST) != 0){
updateWorldLightList(); updateWorldLightList();
@ -178,6 +183,7 @@ public class Node extends Spatial implements Savable {
} }
refreshFlags &= ~RF_CHILD_LIGHTLIST; 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