SDK: Scene move the code from NewGeometry into each Action

experimental
David Bernard 11 years ago
parent ed06161f49
commit d3d5e6f9cb
  1. 112
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewGeometry.java
  2. 22
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewGeometryBoxAction.java
  3. 23
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewGeometryLineAction.java
  4. 37
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewGeometryQuadAction.java
  5. 29
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/NewGeometrySphereAction.java

@ -1,112 +0,0 @@
/*
* Copyright (c) 2009-2010 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* * Neither the name of 'jMonkeyEngine' nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
import com.jme3.asset.AssetManager;
import com.jme3.material.Material;
import com.jme3.math.ColorRGBA;
import com.jme3.math.Quaternion;
import com.jme3.scene.Geometry;
import com.jme3.scene.shape.Box;
import com.jme3.scene.shape.Line;
import com.jme3.scene.shape.Quad;
import com.jme3.scene.shape.Sphere;
/**
*
* @author david.bernard.31
*/
public class NewGeometry {
public static Material material(AssetManager assetManaget, NewGeometrySettings cfg) {
Material mat = new Material(assetManaget, "Common/MatDefs/Misc/Unshaded.j3md");
ColorRGBA c = cfg.getMatRandom() ?ColorRGBA.randomColor() : cfg.getMatColor();
mat.setColor("Color", c);
return mat;
}
public static Geometry box(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Box b = new Box(cfg.getBoxX(), cfg.getBoxY(), cfg.getBoxZ());
b.setMode(cfg.getBoxMode());
Geometry geom = new Geometry(cfg.getBoxName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
public static Geometry sphere(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Sphere b = new Sphere(
cfg.getSphereZSamples()
, cfg.getSpherRadialSamples()
, cfg.getSphereRadius()
, cfg.getSphereUseEvenSlices()
, cfg.getSphereInterior()
);
b.setMode(cfg.getSphereMode());
Geometry geom = new Geometry(cfg.getSphereName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
public static Geometry line(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Line b = new Line(cfg.getLineStart(), cfg.getLineEnd());
b.setMode(cfg.getLineMode());
Geometry geom = new Geometry(cfg.getLineName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
public static Geometry quad(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Quad b = new Quad(cfg.getQuadWidth(), cfg.getQuadHeight(), cfg.getQuadFlipCoords());
b.setMode(cfg.getQuadMode());
Geometry geom = new Geometry(cfg.getQuadName(), b);
switch(cfg.getQuadPlan()) {
case XZ: {
Quaternion q = new Quaternion();
q.fromAngles((float)Math.PI/-2f, 0.0f, 0.0f);
geom.setLocalRotation(q);
break;
}
case YZ: {
Quaternion q = new Quaternion();
q.fromAngles(0.0f, (float)Math.PI/-2f, 0.0f);
geom.setLocalRotation(q);
break;
}
}
geom.setMaterial(material(assetManager, cfg));
return geom;
}
}

@ -31,11 +31,15 @@
*/
package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
import com.jme3.asset.AssetManager;
import com.jme3.gde.core.sceneexplorer.nodes.actions.AbstractNewSpatialAction;
import com.jme3.gde.core.sceneexplorer.nodes.actions.NewGeometryAction;
import com.jme3.material.Material;
import com.jme3.math.ColorRGBA;
import com.jme3.scene.Geometry;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.shape.Box;
/**
*
@ -50,8 +54,24 @@ public class NewGeometryBoxAction extends AbstractNewSpatialAction implements Ne
@Override
protected Spatial doCreateSpatial(Node parent) {
Geometry geom = NewGeometry.box(pm);
Geometry geom = box(pm);
parent.attachChild(geom);
return geom;
}
static Material material(AssetManager assetManaget, NewGeometrySettings cfg) {
Material mat = new Material(assetManaget, "Common/MatDefs/Misc/Unshaded.j3md");
ColorRGBA c = cfg.getMatRandom() ?ColorRGBA.randomColor() : cfg.getMatColor();
mat.setColor("Color", c);
return mat;
}
static Geometry box(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Box b = new Box(cfg.getBoxX(), cfg.getBoxY(), cfg.getBoxZ());
b.setMode(cfg.getBoxMode());
Geometry geom = new Geometry(cfg.getBoxName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
}

@ -31,11 +31,15 @@
*/
package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
import com.jme3.asset.AssetManager;
import com.jme3.gde.core.sceneexplorer.nodes.actions.AbstractNewSpatialAction;
import com.jme3.gde.core.sceneexplorer.nodes.actions.NewGeometryAction;
import com.jme3.material.Material;
import com.jme3.math.ColorRGBA;
import com.jme3.scene.Geometry;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.shape.Line;
/**
*
@ -50,8 +54,25 @@ public class NewGeometryLineAction extends AbstractNewSpatialAction implements N
@Override
protected Spatial doCreateSpatial(Node parent) {
Geometry geom = NewGeometry.line(pm);
Geometry geom = line(pm);
parent.attachChild(geom);
return geom;
}
static Material material(AssetManager assetManaget, NewGeometrySettings cfg) {
Material mat = new Material(assetManaget, "Common/MatDefs/Misc/Unshaded.j3md");
ColorRGBA c = cfg.getMatRandom() ?ColorRGBA.randomColor() : cfg.getMatColor();
mat.setColor("Color", c);
return mat;
}
static Geometry line(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Line b = new Line(cfg.getLineStart(), cfg.getLineEnd());
b.setMode(cfg.getLineMode());
Geometry geom = new Geometry(cfg.getLineName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
}

@ -31,11 +31,16 @@
*/
package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
import com.jme3.asset.AssetManager;
import com.jme3.gde.core.sceneexplorer.nodes.actions.AbstractNewSpatialAction;
import com.jme3.gde.core.sceneexplorer.nodes.actions.NewGeometryAction;
import com.jme3.material.Material;
import com.jme3.math.ColorRGBA;
import com.jme3.math.Quaternion;
import com.jme3.scene.Geometry;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.shape.Quad;
/**
*
@ -50,8 +55,38 @@ public class NewGeometryQuadAction extends AbstractNewSpatialAction implements N
@Override
protected Spatial doCreateSpatial(Node parent) {
Geometry geom = NewGeometry.quad(pm);
Geometry geom = quad(pm);
parent.attachChild(geom);
return geom;
}
static Material material(AssetManager assetManaget, NewGeometrySettings cfg) {
Material mat = new Material(assetManaget, "Common/MatDefs/Misc/Unshaded.j3md");
ColorRGBA c = cfg.getMatRandom() ?ColorRGBA.randomColor() : cfg.getMatColor();
mat.setColor("Color", c);
return mat;
}
static Geometry quad(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Quad b = new Quad(cfg.getQuadWidth(), cfg.getQuadHeight(), cfg.getQuadFlipCoords());
b.setMode(cfg.getQuadMode());
Geometry geom = new Geometry(cfg.getQuadName(), b);
switch(cfg.getQuadPlan()) {
case XZ: {
Quaternion q = new Quaternion();
q.fromAngles((float)Math.PI/-2f, 0.0f, 0.0f);
geom.setLocalRotation(q);
break;
}
case YZ: {
Quaternion q = new Quaternion();
q.fromAngles(0.0f, (float)Math.PI/-2f, 0.0f);
geom.setLocalRotation(q);
break;
}
}
geom.setMaterial(material(assetManager, cfg));
return geom;
}
}

@ -31,11 +31,15 @@
*/
package com.jme3.gde.core.sceneexplorer.nodes.actions.impl;
import com.jme3.asset.AssetManager;
import com.jme3.gde.core.sceneexplorer.nodes.actions.AbstractNewSpatialAction;
import com.jme3.gde.core.sceneexplorer.nodes.actions.NewGeometryAction;
import com.jme3.material.Material;
import com.jme3.math.ColorRGBA;
import com.jme3.scene.Geometry;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.shape.Sphere;
/**
*
@ -50,8 +54,31 @@ public class NewGeometrySphereAction extends AbstractNewSpatialAction implements
@Override
protected Spatial doCreateSpatial(Node parent) {
Geometry geom = NewGeometry.sphere(pm);
Geometry geom = sphere(pm);
parent.attachChild(geom);
return geom;
}
static Material material(AssetManager assetManaget, NewGeometrySettings cfg) {
Material mat = new Material(assetManaget, "Common/MatDefs/Misc/Unshaded.j3md");
ColorRGBA c = cfg.getMatRandom() ?ColorRGBA.randomColor() : cfg.getMatColor();
mat.setColor("Color", c);
return mat;
}
static Geometry sphere(AssetManager assetManager) {
NewGeometrySettings cfg = new NewGeometrySettings();
Sphere b = new Sphere(
cfg.getSphereZSamples()
, cfg.getSpherRadialSamples()
, cfg.getSphereRadius()
, cfg.getSphereUseEvenSlices()
, cfg.getSphereInterior()
);
b.setMode(cfg.getSphereMode());
Geometry geom = new Geometry(cfg.getSphereName(), b);
geom.setMaterial(material(assetManager, cfg));
return geom;
}
}

Loading…
Cancel
Save