diff --git a/jme3-core/src/main/java/com/jme3/material/Technique.java b/jme3-core/src/main/java/com/jme3/material/Technique.java index ea35283f0..8f26a300d 100644 --- a/jme3-core/src/main/java/com/jme3/material/Technique.java +++ b/jme3-core/src/main/java/com/jme3/material/Technique.java @@ -31,6 +31,7 @@ */ package com.jme3.material; +import com.jme3.material.logic.TechniqueDefLogic; import com.jme3.asset.AssetManager; import com.jme3.light.LightList; import com.jme3.material.TechniqueDef.LightMode; diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java index 023f298af..93add2c7b 100644 --- a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java +++ b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java @@ -31,6 +31,7 @@ */ package com.jme3.material; +import com.jme3.material.logic.TechniqueDefLogic; import com.jme3.asset.AssetManager; import com.jme3.export.*; import com.jme3.renderer.Caps; diff --git a/jme3-core/src/main/java/com/jme3/material/DefaultTechniqueDefLogic.java b/jme3-core/src/main/java/com/jme3/material/logic/DefaultTechniqueDefLogic.java similarity index 98% rename from jme3-core/src/main/java/com/jme3/material/DefaultTechniqueDefLogic.java rename to jme3-core/src/main/java/com/jme3/material/logic/DefaultTechniqueDefLogic.java index fb10e704e..ffe72cc00 100644 --- a/jme3-core/src/main/java/com/jme3/material/DefaultTechniqueDefLogic.java +++ b/jme3-core/src/main/java/com/jme3/material/logic/DefaultTechniqueDefLogic.java @@ -29,12 +29,13 @@ * 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.material; +package com.jme3.material.logic; import com.jme3.asset.AssetManager; import com.jme3.light.AmbientLight; import com.jme3.light.Light; import com.jme3.light.LightList; +import com.jme3.material.TechniqueDef; import com.jme3.math.ColorRGBA; import com.jme3.renderer.Caps; import com.jme3.renderer.RenderManager; diff --git a/jme3-core/src/main/java/com/jme3/material/MultiPassLightingLogic.java b/jme3-core/src/main/java/com/jme3/material/logic/MultiPassLightingLogic.java similarity index 98% rename from jme3-core/src/main/java/com/jme3/material/MultiPassLightingLogic.java rename to jme3-core/src/main/java/com/jme3/material/logic/MultiPassLightingLogic.java index 293859b66..7b5e2f4a5 100644 --- a/jme3-core/src/main/java/com/jme3/material/MultiPassLightingLogic.java +++ b/jme3-core/src/main/java/com/jme3/material/logic/MultiPassLightingLogic.java @@ -29,7 +29,7 @@ * 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.material; +package com.jme3.material.logic; import com.jme3.asset.AssetManager; import com.jme3.light.AmbientLight; @@ -38,6 +38,8 @@ import com.jme3.light.Light; import com.jme3.light.LightList; import com.jme3.light.PointLight; import com.jme3.light.SpotLight; +import com.jme3.material.RenderState; +import com.jme3.material.TechniqueDef; import com.jme3.math.ColorRGBA; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; diff --git a/jme3-core/src/main/java/com/jme3/material/SinglePassLightingLogic.java b/jme3-core/src/main/java/com/jme3/material/logic/SinglePassLightingLogic.java similarity index 98% rename from jme3-core/src/main/java/com/jme3/material/SinglePassLightingLogic.java rename to jme3-core/src/main/java/com/jme3/material/logic/SinglePassLightingLogic.java index 75de9054d..2b31c7869 100644 --- a/jme3-core/src/main/java/com/jme3/material/SinglePassLightingLogic.java +++ b/jme3-core/src/main/java/com/jme3/material/logic/SinglePassLightingLogic.java @@ -29,7 +29,7 @@ * 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.material; +package com.jme3.material.logic; import com.jme3.asset.AssetManager; import com.jme3.light.DirectionalLight; @@ -37,7 +37,9 @@ import com.jme3.light.Light; import com.jme3.light.LightList; import com.jme3.light.PointLight; import com.jme3.light.SpotLight; +import com.jme3.material.RenderState; import com.jme3.material.RenderState.BlendMode; +import com.jme3.material.TechniqueDef; import com.jme3.math.ColorRGBA; import com.jme3.math.Vector3f; import com.jme3.math.Vector4f; diff --git a/jme3-core/src/main/java/com/jme3/material/StaticPassLightingLogic.java b/jme3-core/src/main/java/com/jme3/material/logic/StaticPassLightingLogic.java similarity index 98% rename from jme3-core/src/main/java/com/jme3/material/StaticPassLightingLogic.java rename to jme3-core/src/main/java/com/jme3/material/logic/StaticPassLightingLogic.java index c8759980c..0033e7a47 100644 --- a/jme3-core/src/main/java/com/jme3/material/StaticPassLightingLogic.java +++ b/jme3-core/src/main/java/com/jme3/material/logic/StaticPassLightingLogic.java @@ -29,7 +29,7 @@ * 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.material; +package com.jme3.material.logic; import com.jme3.asset.AssetManager; import com.jme3.light.DirectionalLight; @@ -38,6 +38,7 @@ import com.jme3.light.Light.Type; import com.jme3.light.LightList; import com.jme3.light.PointLight; import com.jme3.light.SpotLight; +import com.jme3.material.TechniqueDef; import com.jme3.math.ColorRGBA; import com.jme3.math.Vector3f; import com.jme3.renderer.Caps; diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDefLogic.java b/jme3-core/src/main/java/com/jme3/material/logic/TechniqueDefLogic.java similarity index 99% rename from jme3-core/src/main/java/com/jme3/material/TechniqueDefLogic.java rename to jme3-core/src/main/java/com/jme3/material/logic/TechniqueDefLogic.java index 5cf6e8ab0..95ab8ccf3 100644 --- a/jme3-core/src/main/java/com/jme3/material/TechniqueDefLogic.java +++ b/jme3-core/src/main/java/com/jme3/material/logic/TechniqueDefLogic.java @@ -29,7 +29,7 @@ * 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.material; +package com.jme3.material.logic; import com.jme3.asset.AssetManager; import com.jme3.light.LightList; diff --git a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java index e9286e82b..8b0f831c5 100644 --- a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java +++ b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java @@ -31,6 +31,9 @@ */ package com.jme3.material.plugins; +import com.jme3.material.logic.MultiPassLightingLogic; +import com.jme3.material.logic.SinglePassLightingLogic; +import com.jme3.material.logic.DefaultTechniqueDefLogic; import com.jme3.asset.*; import com.jme3.material.*; import com.jme3.material.RenderState.BlendMode;