Skip to content

Commit

Permalink
v-1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
RedEyedJealousy committed Aug 23, 2018
1 parent 003f766 commit 738cc77
Show file tree
Hide file tree
Showing 13 changed files with 386 additions and 653 deletions.
2 changes: 1 addition & 1 deletion nbproject/private/private.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ javadoc.preview=true
<<<<<<< HEAD
user.properties.file=C:\\Users\\Alex\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
=======
user.properties.file=C:\\Users\\alex\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
user.properties.file=C:\\Users\\Alex\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
26 changes: 11 additions & 15 deletions nbproject/private/private.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<<<<<<< HEAD
<group/>
=======
<group>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/ParallaxAndOcclusion.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/rpmxc/Options.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/MaterialMakerv2.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/MetalnessSection.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/WindowFrame.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/AlbedoSection.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/NormalSection.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/rpmxc/Start.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/Menu.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/CustomEnableSection.java</file>
<file>file:/C:/Users/alex/Documents/NetBeansProjects/RMT/src/mmd/AlphaSection.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/EmissiveSection.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/rpmxc/Start.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/rpmxc/Options.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/AlbedoSection.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/AlphaSection.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/MaterialMakerv2.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/SpecularAndSmoothness.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/Main.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/Menu.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/MetalnessSection.java</file>
<file>file:/E:/ales/Documents/NetBeansProjects/RMT/src/mmd/CustomEnableSection.java</file>
</group>
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
</open-files>
</project-private>
49 changes: 0 additions & 49 deletions src/mmd/AlbedoSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import static mmd.MaterialMakerv2.callMenu;
import rpmxc.Start;

public class AlbedoSection extends javax.swing.JFrame {

Expand Down Expand Up @@ -661,15 +659,9 @@ public float getalbedoMapLoop() {
}

} catch (FileNotFoundException ex) {
<<<<<<< HEAD

} catch (IOException ex) {

=======
System.out.println("fnf" + ex);
} catch (IOException ex) {
System.out.println("io " + ex);
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
} finally {
try {
AlbedotoEdit_Br.close();
Expand Down Expand Up @@ -1612,46 +1604,6 @@ private void closeAllDialogs() {
private void backActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backActionPerformed
closeAllDialogs();
this.dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
<<<<<<< HEAD
=======
/*closeAllDialogs();
WindowFrame w = new WindowFrame();
w.setLocation(this.getLocation());
ErrorWindow.dispose();
w.setSize(960, 549);
w.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
if (foo.getRecursive() == true) {
System.out.println("true");
w.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent we) {
w.dispose();
try {
rpmxc.Options.main(null, Start.parentComponent);
} catch (Exception ex) {
}
}
});
} else {
System.out.println("false");
w.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent we) {
callMenu();
w.dispose();
}
});
}
this.dispose();
w.setAlwaysOnTop(true);
w.setAlwaysOnTop(false);
w.setResizable(false);
w.setLayout(new BorderLayout());
ImageIcon img = new ImageIcon(getClass().getResource("/icon/ico.png"));
w.setIconImage(img.getImage());
w.setVisible(true);*/
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
}//GEN-LAST:event_backActionPerformed

private void AlbedoMapHelpActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_AlbedoMapHelpActionPerformed
Expand Down Expand Up @@ -2745,7 +2697,6 @@ public void run() {

}
});

}

// Variables declaration - do not modify//GEN-BEGIN:variables
Expand Down
2 changes: 0 additions & 2 deletions src/mmd/AlphaSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import static mmd.MaterialMakerv2.callMenu;
import rpmxc.Start;

public class AlphaSection extends javax.swing.JFrame {

Expand Down
2 changes: 0 additions & 2 deletions src/mmd/CustomEnableSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import static mmd.MaterialMakerv2.callMenu;
import rpmxc.Start;

public class CustomEnableSection extends javax.swing.JFrame {

Expand Down
32 changes: 13 additions & 19 deletions src/mmd/EmissiveSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import static mmd.MaterialMakerv2.callMenu;
import rpmxc.Start;

public class EmissiveSection extends javax.swing.JFrame {

Expand Down Expand Up @@ -1492,7 +1490,7 @@ private void AlbedoMapHelpActionPerformed(java.awt.event.ActionEvent evt) {//GEN
BufferedImage myImg = ImageIO.read(imgStream);
AlbedoMapHelp.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapHelpActionPerformed

Expand All @@ -1518,7 +1516,7 @@ private void AlbedoMapUVFlipHelpActionPerformed(java.awt.event.ActionEvent evt)
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapUVFlipHelpActionPerformed

Expand Down Expand Up @@ -1552,7 +1550,7 @@ private void AlbedoMapFileHelpActionPerformed(java.awt.event.ActionEvent evt) {/
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapFileHelpActionPerformed

Expand All @@ -1576,7 +1574,7 @@ private void albedoHelpActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_albedoHelpActionPerformed

Expand All @@ -1601,7 +1599,7 @@ private void AlbedoMapLoopHelpActionPerformed(java.awt.event.ActionEvent evt) {/
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapLoopHelpActionPerformed

Expand Down Expand Up @@ -1629,7 +1627,7 @@ private void AlbedoMapHelp3ActionPerformed(java.awt.event.ActionEvent evt) {//GE
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapHelp3ActionPerformed

Expand All @@ -1655,7 +1653,7 @@ private void AlbedoMapUVFlipHelp1ActionPerformed(java.awt.event.ActionEvent evt)
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapUVFlipHelp1ActionPerformed

Expand All @@ -1679,7 +1677,7 @@ private void albedoHelp1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}

}//GEN-LAST:event_albedoHelp1ActionPerformed
Expand All @@ -1704,7 +1702,7 @@ private void AlbedoMapLoopHelp1ActionPerformed(java.awt.event.ActionEvent evt) {
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapLoopHelp1ActionPerformed

Expand All @@ -1731,7 +1729,7 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_jButton1ActionPerformed

Expand Down Expand Up @@ -1771,7 +1769,7 @@ private void AlbedoMapUVFlipHelp2ActionPerformed(java.awt.event.ActionEvent evt)
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapUVFlipHelp2ActionPerformed

Expand All @@ -1795,7 +1793,7 @@ private void AlbedoMapUVFlipHelp3ActionPerformed(java.awt.event.ActionEvent evt)
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapUVFlipHelp3ActionPerformed

Expand All @@ -1822,7 +1820,7 @@ private void AlbedoMapUVFlipHelp4ActionPerformed(java.awt.event.ActionEvent evt)
BufferedImage myImg = ImageIO.read(imgStream);
help.setIconImage(myImg);
} catch (IOException ex) {

System.out.println("" + ex);
}
}//GEN-LAST:event_AlbedoMapUVFlipHelp4ActionPerformed
private void closeAllDialogs() {
Expand Down Expand Up @@ -2159,11 +2157,7 @@ private void EmissiveScaleKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:
catchNew = EmissiveScale.getText(); //catchnewdigit
catchNew = catchNew.replaceAll(" ", "");
line = ("const float3 emissive = " + catchNew + ";");
<<<<<<< HEAD

=======
System.out.println("" + catchNew);
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
}
oldtext += line + "\r\n";
line = br.readLine();
Expand Down
4 changes: 0 additions & 4 deletions src/mmd/Menu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,7 @@ private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
try {
java.awt.Desktop.getDesktop().browse(java.net.URI.create("https://www.paypal.me/RedEyedJealousy"));
} catch (java.io.IOException e) {
<<<<<<< HEAD

=======
System.out.println(e.getMessage());
>>>>>>> 29c2b9324a955f83e5bc4c8af8e1d0ae353c16e4
}
}//GEN-LAST:event_jButton2ActionPerformed

Expand Down
2 changes: 0 additions & 2 deletions src/mmd/MetalnessSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import static mmd.MaterialMakerv2.callMenu;
import rpmxc.Start;

public class MetalnessSection extends javax.swing.JFrame {

Expand Down
Loading

0 comments on commit 738cc77

Please sign in to comment.