Skip to content

Commit e503d65

Browse files
committed
small fixes
1 parent ad1e3fd commit e503d65

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

src/com/ss/editor/Editor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public void update() {
397397
final WorkspaceManager workspaceManager = WorkspaceManager.getInstance();
398398
workspaceManager.clear();
399399
System.exit(1);
400-
} catch (final RendererException | IllegalStateException e) {
400+
} catch (final RendererException | IllegalStateException | UnsupportedOperationException e) {
401401
LOGGER.warning(e);
402402
GAnalytics.sendException(e, true);
403403
GAnalytics.waitForSend();

src/com/ss/editor/FileExtensions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public interface FileExtensions {
3232

3333
String GLSL_VERTEX = "vert";
3434
String GLSL_FRAGMENT = "frag";
35+
String GLSL_GEOM = "geom";
3536
String GLSL_LIB = "glsllib";
3637

3738
String MODEL_BLENDER = "blend";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public class FileIconManager {
7878

7979
EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.GLSL_FRAGMENT, "gnome-mime-text-x-csharp");
8080
EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.GLSL_VERTEX, "gnome-mime-text-x-csharp");
81+
EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.GLSL_GEOM, "gnome-mime-text-x-csharp");
8182
EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.GLSL_LIB, "gnome-mime-text-x-csharp");
8283
EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.MODEL_XBUF, "image-svg+xml");
8384
}

src/com/ss/editor/ui/component/editor/impl/GLSLFileEditor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class GLSLFileEditor extends CodeAreaFileEditor {
2828
DESCRIPTION.setEditorId(GLSLFileEditor.class.getSimpleName());
2929
DESCRIPTION.addExtension(FileExtensions.GLSL_FRAGMENT);
3030
DESCRIPTION.addExtension(FileExtensions.GLSL_VERTEX);
31+
DESCRIPTION.addExtension(FileExtensions.GLSL_GEOM);
3132
DESCRIPTION.addExtension(FileExtensions.GLSL_LIB);
3233
}
3334

src/com/ss/editor/ui/component/editor/impl/MaterialDefinitionFileEditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ public class MaterialDefinitionFileEditor extends CodeAreaFileEditor {
4040
"ViewMatrix", "CameraPosition", "WorldMatrix", "FaceCull", "DepthTest", "DepthWrite", "PolyOffset",
4141
"ColorWrite", "Blend", "Resolution", "FragmentShader", "ForcedRenderState", "ViewProjectionMatrix",
4242
"IntArray", "FloatArray", "Vector2Array", "Vector3Array", "Vector4Array", "Matrix3",
43-
"Matrix3Array", "Matrix4Array", "TextureBuffer", "Texture3D", "TextureArray"
43+
"Matrix3Array", "Matrix4Array", "TextureBuffer", "Texture3D", "TextureArray", "GeometryShader"
4444
};
4545

4646
private static final String[] VALUE_VALUES = {
4747
"true", "false", "Off", "On", "True", "False", "Disable", "SinglePass", "MultiPass",
4848
"SinglePassAndImageBased", "FixedPipeline", "StaticPass", "InPass", "PostPass", "World", "View",
49-
"Legacy", "GLSL100", "GLSL110", "GLSL120", "GLSL130", "GLSL140", "GLSL150", "GLSL400"
49+
"Legacy", "GLSL100", "GLSL110", "GLSL120", "GLSL130", "GLSL140", "GLSL150", "GLSL400", "GLSL330"
5050
};
5151

5252
private static final String KEYWORD_PATTERN = "\\b(" + String.join("|", KEYWORDS) + ")\\b";

0 commit comments

Comments
 (0)