Prechádzať zdrojové kódy

Allow LightProbes for all Spatials not only Nodes (LightProbeFactory also accepts Spatial as Parameter)

MeFisto94 7 rokov pred
rodič
commit
6f01b94b31

+ 1 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLightProbe.java

@@ -34,7 +34,6 @@ package com.jme3.gde.core.sceneexplorer.nodes;
 
 import com.jme3.light.LightProbe;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import java.beans.PropertyEditor;
 import java.lang.reflect.InvocationTargetException;
@@ -96,7 +95,6 @@ public class JmeLightProbe extends JmeLight{
     
     protected void setModified(){
         java.awt.EventQueue.invokeLater(new Runnable() {
-
             @Override
             public void run() {
                 fireSave(true);
@@ -117,7 +115,7 @@ public class JmeLightProbe extends JmeLight{
             @Override
             public PropertyEditor getPropertyEditor() {
                 if (pe == null) {
-                    pe = new JmeLightProbeButtonProperty(JmeLightProbe.this, (Node)getSpatial());
+                    pe = new JmeLightProbeButtonProperty(JmeLightProbe.this, getSpatial());
                     pe.attachEnv(pe.env);
                 }
                 return pe;

+ 5 - 16
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeLightProbeButtonProperty.java

@@ -2,21 +2,17 @@ package com.jme3.gde.core.sceneexplorer.nodes;
 
 import com.jme3.environment.EnvironmentCamera;
 import com.jme3.environment.LightProbeFactory;
-import com.jme3.environment.generation.JobProgressAdapter;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.controller.SceneToolController;
 import com.jme3.gde.core.util.ButtonInplaceEditor;
-import com.jme3.light.LightProbe;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyEditorSupport;
 import java.util.concurrent.Callable;
-import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.explorer.propertysheet.ExPropertyEditor;
 import org.openide.explorer.propertysheet.InplaceEditor;
 import org.openide.explorer.propertysheet.PropertyEnv;
@@ -26,13 +22,12 @@ import org.openide.explorer.propertysheet.PropertyEnv;
  * @author Nehon
  */
 public class JmeLightProbeButtonProperty extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory {
-
     JmeLightProbe probe;
-    Node node;
+    Spatial spatial;
 
-    public JmeLightProbeButtonProperty(JmeLightProbe pe, Node node) {
+    public JmeLightProbeButtonProperty(JmeLightProbe pe, Spatial node) {
         super();
-        this.node = node;
+        this.spatial = node;
         this.probe = pe;
     }
     PropertyEnv env;
@@ -49,15 +44,11 @@ public class JmeLightProbeButtonProperty extends PropertyEditorSupport implement
         if (ed == null) {
             ed = new ButtonInplaceEditor("Refresh");
             ed.addActionListener(new ActionListener() {
-
                 @Override
                 public void actionPerformed(ActionEvent e) {
-
                     SceneApplication.getApplication().enqueue(new Callable<Object>() {
-
                         @Override
                         public Object call() throws Exception {
-
                             EnvironmentCamera envCam = SceneApplication.getApplication().getStateManager().getState(EnvironmentCamera.class);
                             SceneToolController toolController = SceneApplication.getApplication().getStateManager().getState(SceneToolController.class);
                             if (toolController != null) {
@@ -65,10 +56,8 @@ public class JmeLightProbeButtonProperty extends PropertyEditorSupport implement
                             } else {
                                 envCam.setPosition(new Vector3f(0, 0, 0));
                             }
-                            LightProbeFactory.updateProbe(probe.getLightProbe(), envCam, node, new JmeLightProbeProgressHandler());
-
+                            LightProbeFactory.updateProbe(probe.getLightProbe(), envCam, spatial, new JmeLightProbeProgressHandler());
                             probe.setModified();
-
                             return null;
                         }
                     });