обновление фона в редакторе материалов

мелкие правки
JavaSaBr · Mar 1, 2016 · e61265a · e61265a
1 parent ee67bdd
commit e61265a
Show file tree

Hide file tree

Showing 7 changed files with 6,220 additions and 1,001 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build-native.xml b/build-native.xml
@@ -117,7 +117,7 @@
                         name="jME3-SpaceShift-Editor"
                         mainClass="com.ss.editor.Starter"
                         toolkit="fx"
-                        version="0.1"
+                        version="0.2"
                 />
 
         <mkdir dir="build/classes/META-INF"/>
@@ -130,7 +130,7 @@
             <manifest>
                 <attribute name="Implementation-Vendor" value="spaceshift.ru"/>
                 <attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
-                <attribute name="Implementation-Version" value="0.1"/>
+                <attribute name="Implementation-Version" value="0.2"/>
             </manifest>
         </fx:jar>
 

diff --git a/resources/graphics/textures/sky/studio.hdr b/resources/graphics/textures/sky/studio.hdr
diff --git a/src/com/ss/editor/config/Config.java b/src/com/ss/editor/config/Config.java
@@ -17,7 +17,7 @@ public abstract class Config {
     public static final String CONFIG_RESOURCE_PATH = "/com/ss/editor/config/config.xml";
 
     public static final String TITLE = "jME3 SpaceShift Editor";
-    public static final String VERSION = "v.0.1.1";
+    public static final String VERSION = "v.0.2.0";
 
     /**
      * Путь к папке с программой.

diff --git a/src/com/ss/editor/manager/FileIconManager.java b/src/com/ss/editor/manager/FileIconManager.java
@@ -120,8 +120,6 @@ public Image getIcon(final Path path, int size) {
         Path iconPath = mimeTypes.resolve(valueOf(size)).resolve(contentType + ".png");
         String url = toClasspath(iconPath);
 
-        LOGGER.info("url " + url);
-
         if (!EditorUtil.checkExists(url)) {
             iconPath = mimeTypes.resolve(valueOf(size)).resolve("none.png");
             url = toClasspath(iconPath);

diff --git a/src/com/ss/editor/state/editor/impl/material/MaterialEditorState.java b/src/com/ss/editor/state/editor/impl/material/MaterialEditorState.java
@@ -4,6 +4,7 @@
 import com.jme3.app.state.AppStateManager;
 import com.jme3.asset.AssetManager;
 import com.jme3.environment.generation.JobProgressAdapter;
+import com.jme3.input.ChaseCamera;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.LightProbe;
 import com.jme3.material.Material;
@@ -20,6 +21,8 @@
 import com.ss.editor.manager.ExecutorManager;
 import com.ss.editor.state.editor.impl.AbstractEditorState;
 
+import rlib.geom.util.AngleUtils;
+
 /**
  * Реализация 3D части редактирования материала.
  *
@@ -30,6 +33,10 @@ public class MaterialEditorState extends AbstractEditorState {
     public static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
 
     private static final Vector3f QUAD_OFFSET = new Vector3f(0, -2, 2);
+    private static final Vector3f LIGHT_DIRECTION = new Vector3f(0.007654993F, 0.39636374F, 0.9180617F).negate();
+
+    private static final float H_ROTATION = AngleUtils.degreeToRadians(75);
+    private static final float V_ROTATION = AngleUtils.degreeToRadians(25);
 
     private final JobProgressAdapter<LightProbe> probeHandler = new JobProgressAdapter<LightProbe>() {
 
@@ -93,7 +100,11 @@ public MaterialEditorState() {
         stateNode.attachChild(sky);
 
         final DirectionalLight light = getLightForChaseCamera();
-        light.setDirection(new Vector3f(-0.897672F, -0.2953406F, -0.32704628F));
+        light.setDirection(LIGHT_DIRECTION);
+
+        final ChaseCamera chaseCamera = getChaseCamera();
+        chaseCamera.setDefaultHorizontalRotation(H_ROTATION);
+        chaseCamera.setDefaultVerticalRotation(V_ROTATION);
     }
 
     /**

diff --git a/src/com/ss/editor/state/editor/impl/post/filter/PostFilterEditorState.java b/src/com/ss/editor/state/editor/impl/post/filter/PostFilterEditorState.java
@@ -108,7 +108,7 @@ public void addFilter(final Material material) {
 
     private void addFilterImpl(Material material) {
 
-        final GenericFilter genericFilter = new GenericFilter(material, true, true);
+        final GenericFilter genericFilter = new GenericFilter(material, false, true);
         final FilterPostProcessor postProcessor = EDITOR.getPostProcessor();
 
         final ConcurrentObjectDictionary<MaterialKey, GenericFilter> filters = getFilters();