Skip to content

Commit e61265a

Browse files
committed
обновление фона в редакторе материалов
мелкие правки
1 parent ee67bdd commit e61265a

File tree

7 files changed

+6220
-1001
lines changed

7 files changed

+6220
-1001
lines changed

.idea/misc.xml

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-native.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
name="jME3-SpaceShift-Editor"
118118
mainClass="com.ss.editor.Starter"
119119
toolkit="fx"
120-
version="0.1"
120+
version="0.2"
121121
/>
122122

123123
<mkdir dir="build/classes/META-INF"/>
@@ -130,7 +130,7 @@
130130
<manifest>
131131
<attribute name="Implementation-Vendor" value="spaceshift.ru"/>
132132
<attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
133-
<attribute name="Implementation-Version" value="0.1"/>
133+
<attribute name="Implementation-Version" value="0.2"/>
134134
</manifest>
135135
</fx:jar>
136136

resources/graphics/textures/sky/studio.hdr

Lines changed: 6204 additions & 987 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public abstract class Config {
1717
public static final String CONFIG_RESOURCE_PATH = "/com/ss/editor/config/config.xml";
1818

1919
public static final String TITLE = "jME3 SpaceShift Editor";
20-
public static final String VERSION = "v.0.1.1";
20+
public static final String VERSION = "v.0.2.0";
2121

2222
/**
2323
* Путь к папке с программой.

src/com/ss/editor/manager/FileIconManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ public Image getIcon(final Path path, int size) {
120120
Path iconPath = mimeTypes.resolve(valueOf(size)).resolve(contentType + ".png");
121121
String url = toClasspath(iconPath);
122122

123-
LOGGER.info("url " + url);
124-
125123
if (!EditorUtil.checkExists(url)) {
126124
iconPath = mimeTypes.resolve(valueOf(size)).resolve("none.png");
127125
url = toClasspath(iconPath);

src/com/ss/editor/state/editor/impl/material/MaterialEditorState.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.jme3.app.state.AppStateManager;
55
import com.jme3.asset.AssetManager;
66
import com.jme3.environment.generation.JobProgressAdapter;
7+
import com.jme3.input.ChaseCamera;
78
import com.jme3.light.DirectionalLight;
89
import com.jme3.light.LightProbe;
910
import com.jme3.material.Material;
@@ -20,6 +21,8 @@
2021
import com.ss.editor.manager.ExecutorManager;
2122
import com.ss.editor.state.editor.impl.AbstractEditorState;
2223

24+
import rlib.geom.util.AngleUtils;
25+
2326
/**
2427
* Реализация 3D части редактирования материала.
2528
*
@@ -30,6 +33,10 @@ public class MaterialEditorState extends AbstractEditorState {
3033
public static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
3134

3235
private static final Vector3f QUAD_OFFSET = new Vector3f(0, -2, 2);
36+
private static final Vector3f LIGHT_DIRECTION = new Vector3f(0.007654993F, 0.39636374F, 0.9180617F).negate();
37+
38+
private static final float H_ROTATION = AngleUtils.degreeToRadians(75);
39+
private static final float V_ROTATION = AngleUtils.degreeToRadians(25);
3340

3441
private final JobProgressAdapter<LightProbe> probeHandler = new JobProgressAdapter<LightProbe>() {
3542

@@ -93,7 +100,11 @@ public MaterialEditorState() {
93100
stateNode.attachChild(sky);
94101

95102
final DirectionalLight light = getLightForChaseCamera();
96-
light.setDirection(new Vector3f(-0.897672F, -0.2953406F, -0.32704628F));
103+
light.setDirection(LIGHT_DIRECTION);
104+
105+
final ChaseCamera chaseCamera = getChaseCamera();
106+
chaseCamera.setDefaultHorizontalRotation(H_ROTATION);
107+
chaseCamera.setDefaultVerticalRotation(V_ROTATION);
97108
}
98109

99110
/**

src/com/ss/editor/state/editor/impl/post/filter/PostFilterEditorState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void addFilter(final Material material) {
108108

109109
private void addFilterImpl(Material material) {
110110

111-
final GenericFilter genericFilter = new GenericFilter(material, true, true);
111+
final GenericFilter genericFilter = new GenericFilter(material, false, true);
112112
final FilterPostProcessor postProcessor = EDITOR.getPostProcessor();
113113

114114
final ConcurrentObjectDictionary<MaterialKey, GenericFilter> filters = getFilters();

0 commit comments

Comments
 (0)