добавление в настройки гамма коррекции и экспозиции, фиксы багов

Author: JavaSaBr

build-native.xml

@@ -117,7 +117,7 @@
                         name="jME3-SpaceShift-Editor"
                         mainClass="com.ss.editor.Starter"
                         toolkit="fx"
-                        version="0.6.0"
+                        version="0.6.1"
                 />
 
         <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.6.0"/>
+                <attribute name="Implementation-Version" value="0.6.1"/>
             </manifest>
         </fx:jar>
 

build/package/linux/control

@@ -1,5 +1,5 @@
 Package: jme3-spaceshift-editor
-Version: 0.6.0
+Version: 0.6.1
 Section: tool
 Maintainer: spaceshift.ru <[email protected]>
 Priority: optional

libs/jfx-1.2.jar renamed to libs/jfx-1.3.jar

@@ -69,6 +69,9 @@ EditorBarComponent.settings.graphics=Graphics settings
 GraphicsDialogTitle=Graphics settings
 GraphicsDialogFXAA=Enable FXAA
 GraphicsDialogFullscreen=Fullscreen
+GraphicsDialogGammaCorrection=Gamma correction
+GraphicsDialogToneMapFilter=Exposure filter
+GraphicsDialogToneMapFilterWhitePoint=Exposure white point
 GraphicsDialogScreenSize=Screen size
 GraphicsDialogAnisotropy=Anisotropy
 GraphicsDialogButtonOk=Apply

resources/messages/messages.properties

@@ -69,6 +69,9 @@ EditorBarComponent.settings.graphics=Настройки графики
 GraphicsDialogTitle=Настройки графики
 GraphicsDialogFXAA=Включить FXAA
 GraphicsDialogFullscreen=Полноэкранный режим
+GraphicsDialogGammaCorrection=Коррекция гаммы
+GraphicsDialogToneMapFilter=Фильтр экспозиции
+GraphicsDialogToneMapFilterWhitePoint=Точка белого экспозиции
 GraphicsDialogScreenSize=Разрешение экрана
 GraphicsDialogAnisotropy=Анизатропная фильтрация
 GraphicsDialogButtonOk=Применить

resources/messages/messages_ru.properties

@@ -9,11 +9,13 @@
 import com.jme3.environment.EnvironmentCamera;
 import com.jme3.environment.LightProbeFactory;
 import com.jme3.environment.generation.JobProgressAdapter;
+import com.jme3.input.InputManager;
 import com.jme3.light.LightProbe;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.FXAAFilter;
+import com.jme3.post.filters.ToneMapFilter;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.Node;
 import com.jme3.system.AppSettings;
@@ -96,6 +98,7 @@ public static void start(String[] args) throws IOException {
 
             final EditorConfig config = EditorConfig.getInstance();
             final AppSettings settings = config.getSettings();
+            settings.setGammaCorrection(false);
 
             EDITOR.setSettings(settings);
             EDITOR.setShowSettings(false);
@@ -165,6 +168,16 @@ protected static void configureLogger() {
      */
     private FilterPostProcessor postProcessor;
 
+    /**
+     * FXAA фильтр.
+     */
+    private FXAAFilter fxaaFilter;
+
+    /**
+     * Фильтр коррекции экспозиции.
+     */
+    private ToneMapFilter toneMapFilter;
+
     private Editor() {
         this.lock = new StampedLock();
     }
@@ -257,19 +270,19 @@ public void simpleInitApp() {
         postProcessor = new FilterPostProcessor(assetManager);
         postProcessor.initialize(renderManager, viewPort);
 
-        if (editorConfig.isFXAA()) {
-
-            final FXAAFilter filter = new FXAAFilter();
-            filter.setEnabled(true);
-            filter.setSubPixelShift(1.0f / 4.0f);
-            filter.setVxOffset(0.0f);
-            filter.setSpanMax(8.0f);
-            filter.setReduceMul(1.0f / 8.0f);
+        fxaaFilter = new FXAAFilter();
+        fxaaFilter.setEnabled(editorConfig.isFXAA());
+        fxaaFilter.setSubPixelShift(1.0f / 4.0f);
+        fxaaFilter.setVxOffset(0.0f);
+        fxaaFilter.setSpanMax(8.0f);
+        fxaaFilter.setReduceMul(1.0f / 8.0f);
 
-            postProcessor.addFilter(filter);
-        }
+        toneMapFilter = new ToneMapFilter();
+        toneMapFilter.setWhitePoint(editorConfig.getToneMapFilterWhitePoint());
+        toneMapFilter.setEnabled(editorConfig.isToneMapFilter());
 
-        // postProcessor.addFilter(new ToneMapFilter());
+        postProcessor.addFilter(fxaaFilter);
+        postProcessor.addFilter(toneMapFilter);
 
         viewPort.addProcessor(postProcessor);
 
@@ -284,7 +297,7 @@ public void simpleInitApp() {
             stateManager.attach(environmentCamera);
         }
 
-        fxContainer = JmeFxContainer.install(this, guiNode, true, cursorDisplayProvider);
+        fxContainer = JmeFxContainer.install(this, guiNode, cursorDisplayProvider);
         scene = EditorFXSceneBuilder.build(fxContainer);
 
         UIUtils.overrideTooltipBehavior(1000, 3000, 500);
@@ -316,8 +329,14 @@ public long trySyncLock() {
     @Override
     public void update() {
 
+        final ExecutorManager executorManager = ExecutorManager.getInstance();
+        final InputManager inputManager = getInputManager();
         final JmeFxContainer fxContainer = getFxContainer();
 
+        if(fxContainer.isVisibleCursor() != inputManager.isCursorVisible()) {
+            fxContainer.setVisibleCursor(inputManager.isCursorVisible());
+        }
+
         final long stamp = syncLock();
         try {
 
@@ -407,4 +426,18 @@ public LightProbe getLightProbe() {
     public EnvironmentCamera getEnvironmentCamera() {
         return environmentCamera;
     }
+
+    /**
+     * @return фильтр коррекции экспозиции.
+     */
+    public ToneMapFilter getToneMapFilter() {
+        return toneMapFilter;
+    }
+
+    /**
+     * @return FXAA фильтр.
+     */
+    public FXAAFilter getFXAAFilter() {
+        return fxaaFilter;
+    }
 }

src/com/ss/editor/Editor.java

@@ -85,6 +85,9 @@ public class Messages {
     public static final String GRAPHICS_DIALOG_TITLE;
     public static final String GRAPHICS_DIALOG_FXAA;
     public static final String GRAPHICS_DIALOG_FULLSCREEN;
+    public static final String GRAPHICS_DIALOG_GAMMA_CORRECTION;
+    public static final String GRAPHICS_DIALOG_TONEMAP_FILTER;
+    public static final String GRAPHICS_DIALOG_TONEMAP_FILTER_WHITE_POINT;
     public static final String GRAPHICS_DIALOG_SCREEN_SIZE;
     public static final String GRAPHICS_DIALOG_ANISOTROPY;
     public static final String GRAPHICS_DIALOG_BUTTON_OK;
@@ -172,6 +175,7 @@ public class Messages {
     public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE_RADIUS;
     public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_BOX;
 
+
     static {
 
         final Locale locale = Locale.getDefault();
@@ -256,6 +260,9 @@ public class Messages {
         GRAPHICS_DIALOG_TITLE = bundle.getString("GraphicsDialogTitle");
         GRAPHICS_DIALOG_FXAA = bundle.getString("GraphicsDialogFXAA");
         GRAPHICS_DIALOG_FULLSCREEN = bundle.getString("GraphicsDialogFullscreen");
+        GRAPHICS_DIALOG_GAMMA_CORRECTION = bundle.getString("GraphicsDialogGammaCorrection");
+        GRAPHICS_DIALOG_TONEMAP_FILTER = bundle.getString("GraphicsDialogToneMapFilter");
+        GRAPHICS_DIALOG_TONEMAP_FILTER_WHITE_POINT = bundle.getString("GraphicsDialogToneMapFilterWhitePoint");
         GRAPHICS_DIALOG_SCREEN_SIZE = bundle.getString("GraphicsDialogScreenSize");
         GRAPHICS_DIALOG_ANISOTROPY = bundle.getString("GraphicsDialogAnisotropy");
         GRAPHICS_DIALOG_BUTTON_OK = bundle.getString("GraphicsDialogButtonOk");

src/com/ss/editor/Messages.java

@@ -20,7 +20,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.6.0";
+    public static final String VERSION = "v.0.6.1";
 
     public static final String SS_FOLDER_IN_USER_HOME = ".jme3-spaceshift-editor";
 

src/com/ss/editor/config/Config.java

@@ -3,6 +3,7 @@
 import com.jme3.asset.AssetEventListener;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.TextureKey;
+import com.jme3.math.Vector3f;
 import com.jme3.system.AppSettings;
 import com.ss.editor.Editor;
 import com.ss.editor.EditorContext;
@@ -39,6 +40,9 @@ public final class EditorConfig implements AssetEventListener {
     public static final String PREF_GRAPHIC_ANISOTROPY = GRAPHICS_ALIAS + "." + "anisotropy";
     public static final String PREF_GRAPHIC_FXAA = GRAPHICS_ALIAS + "." + "fxaa";
     public static final String PREF_GRAPHIC_FULLSCREEN = GRAPHICS_ALIAS + "." + "fullscreen";
+    public static final String PREF_GRAPHIC_GAMA_CORRECTION = GRAPHICS_ALIAS + "." + "gammaCorrection";
+    public static final String PREF_GRAPHIC_TONEMAP_FILTER = GRAPHICS_ALIAS + "." + "toneMapFilter";
+    public static final String PREF_GRAPHIC_TONEMAP_FILTER_WHITE_POINT = GRAPHICS_ALIAS + "." + "toneMapFilterWhitePoint";
 
     public static final String PREF_CURRENT_ASSET = ASSET_ALIAS + "." + "currentAsset";
     public static final String PREF_LAST_OPENED_ASSETS = ASSET_ALIAS + "." + "lastOpenedAssets";
@@ -68,6 +72,11 @@ public static EditorConfig getInstance() {
      */
     private volatile ScreenSize screenSize;
 
+    /**
+     * Точка белого на фильтре экспозиции.
+     */
+    private volatile Vector3f toneMapFilterWhitePoint;
+
     /**
      * Уровень анизатропной фильтрации.
      */
@@ -83,6 +92,16 @@ public static EditorConfig getInstance() {
      */
     private volatile boolean fullscreen;
 
+    /**
+     * Включен ли режим гамма коррекции.
+     */
+    private volatile boolean gammaCorrection;
+
+    /**
+     * Включен ли фильтр экспозиции.
+     */
+    private volatile boolean toneMapFilter;
+
     /**
      * Текущий выбранный Asset.
      */
@@ -200,6 +219,48 @@ public boolean isFullscreen() {
         return fullscreen;
     }
 
+    /**
+     * @return включен ли режим гамма коррекции.
+     */
+    public boolean isGammaCorrection() {
+        return gammaCorrection;
+    }
+
+    /**
+     * @param gammaCorrection включен ли режим гамма коррекции.
+     */
+    public void setGammaCorrection(final boolean gammaCorrection) {
+        this.gammaCorrection = gammaCorrection;
+    }
+
+    /**
+     * @return включен ли фильтр экспозиции.
+     */
+    public boolean isToneMapFilter() {
+        return toneMapFilter;
+    }
+
+    /**
+     * @param toneMapFilter включен ли фильтр экспозиции.
+     */
+    public void setToneMapFilter(final boolean toneMapFilter) {
+        this.toneMapFilter = toneMapFilter;
+    }
+
+    /**
+     * @return точка белого на фильтре экспозиции.
+     */
+    public Vector3f getToneMapFilterWhitePoint() {
+        return toneMapFilterWhitePoint;
+    }
+
+    /**
+     * @param toneMapFilterWhitePoint точка белого на фильтре экспозиции.
+     */
+    public void setToneMapFilterWhitePoint(final Vector3f toneMapFilterWhitePoint) {
+        this.toneMapFilterWhitePoint = toneMapFilterWhitePoint;
+    }
+
     /**
      * @return настройки движка.
      */
@@ -233,6 +294,8 @@ private void init() {
         this.anisotropy = prefs.getInt(PREF_GRAPHIC_ANISOTROPY, 0);
         this.fxaa = prefs.getBoolean(PREF_GRAPHIC_FXAA, false);
         this.fullscreen = prefs.getBoolean(PREF_GRAPHIC_FULLSCREEN, false);
+        this.gammaCorrection = prefs.getBoolean(PREF_GRAPHIC_GAMA_CORRECTION, false);
+        this.toneMapFilter = prefs.getBoolean(PREF_GRAPHIC_TONEMAP_FILTER, false);
 
         final String currentAssetURI = prefs.get(PREF_CURRENT_ASSET, null);
 
@@ -244,6 +307,23 @@ private void init() {
             }
         }
 
+        this.toneMapFilterWhitePoint = new Vector3f(11, 11, 11);
+
+        final String whitePoint = prefs.get(PREF_GRAPHIC_TONEMAP_FILTER_WHITE_POINT, null);
+        final String[] coords = whitePoint == null? null : whitePoint.split(",", 3);
+
+        if (coords != null && coords.length > 2) {
+            try {
+
+                toneMapFilterWhitePoint.setX(Float.parseFloat(coords[0]));
+                toneMapFilterWhitePoint.setY(Float.parseFloat(coords[1]));
+                toneMapFilterWhitePoint.setZ(Float.parseFloat(coords[2]));
+
+            } catch (NumberFormatException e) {
+                LOGGER.error(e);
+            }
+        }
+
         final List<String> deserializeLastOpened = EditorUtil.deserialize(prefs.getByteArray(PREF_LAST_OPENED_ASSETS, null));
 
         if (deserializeLastOpened != null) {
@@ -262,6 +342,12 @@ public void save() {
         prefs.putInt(PREF_GRAPHIC_ANISOTROPY, getAnisotropy());
         prefs.putBoolean(PREF_GRAPHIC_FXAA, isFXAA());
         prefs.putBoolean(PREF_GRAPHIC_FULLSCREEN, isFullscreen());
+        prefs.putBoolean(PREF_GRAPHIC_GAMA_CORRECTION, isGammaCorrection());
+        prefs.putBoolean(PREF_GRAPHIC_TONEMAP_FILTER, isToneMapFilter());
+
+        final Vector3f whitePoint = getToneMapFilterWhitePoint();
+
+        prefs.put(PREF_GRAPHIC_TONEMAP_FILTER_WHITE_POINT, whitePoint.getX() + "," + whitePoint.getY() + "," + whitePoint.getZ());
 
         if (currentAsset != null) {
             prefs.put(PREF_CURRENT_ASSET, currentAsset.toUri().toString());

src/com/ss/editor/config/EditorConfig.java

@@ -103,6 +103,10 @@ private Path getCacheFolder() {
      */
     public Image getTexturePreview(final Path file, final int width, final int height) {
 
+        if(!Files.exists(file)) {
+            return Icons.IMAGE_512;
+        }
+
         final Path cacheFolder = getCacheFolder();
         final Path imageFolder = cacheFolder.resolve(String.valueOf(width)).resolve(String.valueOf(height));
         final Path cacheFile = imageFolder.resolve(file.subpath(1, file.getNameCount()));