Skip to content

Commit 4295591

Browse files
committed
fixed the font in tooltips, fixed handling some render exceptions.
1 parent db0a30e commit 4295591

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

resources/ui/css/base.bss

8 Bytes
Binary file not shown.

resources/ui/css/base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@
828828
-fx-border-width: 1px;
829829
-fx-border-radius: 2px;
830830
-fx-effect: -fx-shadow-menu;
831+
-fx-text-fill: -var-font-color;
831832
}
832833

833834
/*******************************************************************************

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

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static com.ss.rlib.util.FileUtils.getExtension;
77
import static com.ss.rlib.util.ObjectUtils.notNull;
88
import com.jme3.asset.AssetManager;
9+
import com.jme3.asset.AssetNotFoundException;
910
import com.jme3.environment.generation.JobProgressAdapter;
1011
import com.jme3.light.DirectionalLight;
1112
import com.jme3.light.LightProbe;
@@ -14,6 +15,7 @@
1415
import com.jme3.math.Vector3f;
1516
import com.jme3.renderer.Camera;
1617
import com.jme3.renderer.RenderManager;
18+
import com.jme3.renderer.RendererException;
1719
import com.jme3.renderer.ViewPort;
1820
import com.jme3.scene.Geometry;
1921
import com.jme3.scene.Node;
@@ -31,6 +33,9 @@
3133
import com.ss.editor.executor.impl.EditorThreadExecutor;
3234
import com.ss.editor.model.tool.TangentGenerator;
3335
import com.ss.editor.ui.scene.EditorFXScene;
36+
import com.ss.editor.util.EditorUtil;
37+
import com.ss.rlib.logging.Logger;
38+
import com.ss.rlib.logging.LoggerManager;
3439
import com.ss.rlib.ui.util.FXUtils;
3540
import com.ss.rlib.util.array.Array;
3641
import com.ss.rlib.util.array.ArrayFactory;
@@ -48,6 +53,9 @@
4853
*/
4954
public class JMEFilePreviewManager extends AbstractControl {
5055

56+
@NotNull
57+
private static final Logger LOGGER = LoggerManager.getLogger(JMEFilePreviewManager.class);
58+
5159
@NotNull
5260
private static final Vector3f LIGHT_DIRECTION = new Vector3f(0.007654993F, 0.39636374F, 0.9180617F).negate();
5361

@@ -238,11 +246,20 @@ private void showObject(@NotNull final String path) {
238246
camera.setLocation(CAMERA_LOCATION);
239247
camera.setRotation(CAMERA_ROTATION);
240248

249+
modelNode.detachAllChildren();
250+
241251
final AssetManager assetManager = EDITOR.getAssetManager();
242252
final Spatial model = assetManager.loadModel(path);
253+
try {
243254

244-
modelNode.detachAllChildren();
245-
modelNode.attachChild(model);
255+
final RenderManager renderManager = EDITOR.getRenderManager();
256+
renderManager.preloadScene(model);
257+
258+
modelNode.attachChild(model);
259+
260+
} catch (final RendererException | AssetNotFoundException | UnsupportedOperationException e) {
261+
EditorUtil.handleException(LOGGER, this, e);
262+
}
246263

247264
final Node rootNode = EDITOR.getPreviewNode();
248265
rootNode.detachChild(modelNode);
@@ -266,10 +283,19 @@ private void showMaterial(@NotNull final String path) {
266283
final AssetManager assetManager = EDITOR.getAssetManager();
267284
final Material material = assetManager.loadMaterial(path);
268285

286+
modelNode.detachAllChildren();
287+
269288
testBox.setMaterial(material);
289+
try {
270290

271-
modelNode.detachAllChildren();
272-
modelNode.attachChild(testBox);
291+
final RenderManager renderManager = EDITOR.getRenderManager();
292+
renderManager.preloadScene(testBox);
293+
294+
modelNode.attachChild(testBox);
295+
296+
} catch (final RendererException | AssetNotFoundException | UnsupportedOperationException e) {
297+
EditorUtil.handleException(LOGGER, this, e);
298+
}
273299

274300
final Node rootNode = EDITOR.getPreviewNode();
275301
rootNode.detachChild(modelNode);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.jme3.app.Application;
55
import com.jme3.app.state.AppStateManager;
66
import com.jme3.asset.AssetManager;
7+
import com.jme3.asset.AssetNotFoundException;
78
import com.jme3.environment.generation.JobProgressAdapter;
89
import com.jme3.input.InputManager;
910
import com.jme3.input.KeyInput;
@@ -220,7 +221,7 @@ private void updateMaterialImpl(@NotNull final Material material) {
220221
final RenderManager renderManager = EDITOR.getRenderManager();
221222
try {
222223
renderManager.preloadScene(testBox);
223-
} catch (final RendererException | UnsupportedOperationException e) {
224+
} catch (final RendererException | AssetNotFoundException | UnsupportedOperationException e) {
224225
EditorUtil.handleException(LOGGER, this, e);
225226
testBox.setMaterial(EDITOR.getDefaultMaterial());
226227
testQuad.setMaterial(EDITOR.getDefaultMaterial());

src/com/ss/editor/state/editor/impl/scene/AbstractSceneEditorAppState.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static java.util.Objects.requireNonNull;
66
import com.jme3.app.state.AppState;
77
import com.jme3.asset.AssetManager;
8+
import com.jme3.asset.AssetNotFoundException;
89
import com.jme3.audio.AudioNode;
910
import com.jme3.bounding.BoundingBox;
1011
import com.jme3.bounding.BoundingSphere;
@@ -1430,7 +1431,7 @@ private void openModelImpl(@NotNull final M model) {
14301431
final RenderManager renderManager = EDITOR.getRenderManager();
14311432
try {
14321433
renderManager.preloadScene(geometry);
1433-
} catch (final RendererException | UnsupportedOperationException e) {
1434+
} catch (final RendererException | AssetNotFoundException | UnsupportedOperationException e) {
14341435

14351436
EditorUtil.handleException(LOGGER, this,
14361437
new RuntimeException("Found invalid material in the geometry: [" + geometry.getName() + "]. " +

0 commit comments

Comments
 (0)