Skip to content

Improved ShaderNodes #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2016
Merged

Improved ShaderNodes #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public String getShaderCode(String version, Shader.ShaderType type) {
return "";
} catch (Exception e) {
Exceptions.printStackTrace(e);
return "error generating shader " + e.getMessage();
return "Error generating shader: " + e.getMessage();
}
}

Expand Down
1 change: 1 addition & 0 deletions sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/MatDefDataObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public MatDefDataObject(FileObject pf, MultiFileLoader loader) throws DataObject
findAssetManager();
final MatDefMetaData metaData = new MatDefMetaData(this);
lookupContents.add(metaData);
lookupContents.add(new MatDefNavigatorPanel());
pf.addFileChangeListener(new FileChangeAdapter() {
@Override
public void fileChanged(FileEvent fe) {
Expand Down
5 changes: 3 additions & 2 deletions sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public void run() {
});
}

private int lastErrorHash = 0;
private static int lastErrorHash = 0;

private void smartLog(String expText, String message) {
int hash = message.hashCode();
Expand Down Expand Up @@ -183,7 +183,8 @@ public Material reloadMaterial(Material mat) {
//compilation error, the shader code will be output to the console
//the following code will output the error
//System.err.println(e.getMessage());
Logger.getLogger(MaterialDebugAppState.class.getName()).log(Level.SEVERE, e.getMessage());
//Logger.getLogger(MaterialDebugAppState.class.getName()).log(Level.SEVERE, e.getMessage());
smartLog("{0}", e.getMessage());

java.awt.EventQueue.invokeLater(new Runnable() {
public void run() {
Expand Down