Skip to content

Commit

Permalink
Corrected some problems in linux: shader for quickamp, and use of som…
Browse files Browse the repository at this point in the history
…e deprecated methods.
  • Loading branch information
asiermarzo committed May 1, 2020
1 parent a3329d3 commit ef1eb5a
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 107 deletions.
190 changes: 95 additions & 95 deletions AcousticFieldSim/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=AcousticField3D
application.vendor=Asier
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/AcousticField3D.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.gluegen-rt.jar=jars\\gluegen-rt.jar
file.reference.gluegen.jar=jars\\gluegen.jar
file.reference.jogl-all.jar=jars\\jogl-all.jar
file.reference.RXTXcomm.jar=jars\\RXTXcomm.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.jogl-all.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.gluegen.jar}:\
${file.reference.RXTXcomm.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.external.vm=false
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=11
javac.target=11
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jlink.launcher=false
jlink.launcher.name=AcousticField3D
main.class=acousticfield3d.AcousticField3D
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
run.modulepath=\
${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=AcousticField3D
application.vendor=Asier
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/AcousticField3D.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.gluegen-rt.jar=jars\\gluegen-rt.jar
file.reference.gluegen.jar=jars\\gluegen.jar
file.reference.jogl-all.jar=jars\\jogl-all.jar
file.reference.RXTXcomm.jar=jars\\RXTXcomm.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.jogl-all.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.gluegen.jar}:\
${file.reference.RXTXcomm.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked
javac.deprecation=true
javac.external.vm=false
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=11
javac.target=11
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jlink.launcher=false
jlink.launcher.name=AcousticField3D
main.class=acousticfield3d.AcousticField3D
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
run.modulepath=\
${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
8 changes: 4 additions & 4 deletions AcousticFieldSim/src/acousticfield3d/gui/MainForm.java
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
jMenu1.add(saveSimMenu);

saveSameFileMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.CTRL_MASK));
saveSameFileMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.CTRL_DOWN_MASK));
saveSameFileMenu.setText("Save");
saveSameFileMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
Expand All @@ -703,7 +703,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
jMenu1.add(saveSameFileMenu);

loadLastMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.CTRL_MASK));
loadLastMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.CTRL_DOWN_MASK));
loadLastMenu.setText("Load last");
loadLastMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
Expand Down Expand Up @@ -915,7 +915,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jMenu4.setText("Transducers");

selectAllTransducersMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK));
selectAllTransducersMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_DOWN_MASK));
selectAllTransducersMenu.setText("Select all");
selectAllTransducersMenu.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
Expand Down Expand Up @@ -2261,7 +2261,7 @@ private void updateSelection(MouseEvent evt) {
}


if ((evt.getModifiers() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK) {
if ((evt.getModifiersEx() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK) {
if(selection.contains(e)){
selection.remove(e);
e.selected = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ vec2 fieldAt(vec3 point){
}

float ampDirAtt = amplitudeConstant * directivity / dist;
float kdPlusPhase = k * dist + tSpecs[i].x;
float kdPlusPhase = k * dist + tSpecs[i];

field.x += ampDirAtt * cos(kdPlusPhase);
field.y += ampDirAtt * sin(kdPlusPhase);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @author Asier
*/
public class GenericListModel<E> extends AbstractListModel {
public class GenericListModel<E extends Object> extends AbstractListModel<E> {
private final ArrayList<E> elements;

public GenericListModel() {
Expand Down Expand Up @@ -109,9 +109,9 @@ public int getSize() {
}

@Override
public Object getElementAt(int index) {
public E getElementAt(int index) {
E element = elements.get(index);
return element.toString();
return element;
}

public synchronized void copyFrom(GenericListModel<E> other) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class GenericTableModel<E> extends AbstractTableModel{
private GenericTableModelElement<E> tableAccessor;

public GenericTableModel() {
elements = new ArrayList<E>();
elements = new ArrayList<>();
}

public GenericTableModel(GenericTableModelElement<E> gtm) {
tableAccessor = gtm;
elements = new ArrayList();
elements = new ArrayList<>();
}

public ArrayList<E> getElements() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public Network(NetworkInterface contact) {
}

public List<String> getPortList() {
Enumeration<CommPortIdentifier> portList;

ArrayList<String> portVect = new ArrayList<String>();
portList = CommPortIdentifier.getPortIdentifiers();
Enumeration<CommPortIdentifier> portList = CommPortIdentifier.getPortIdentifiers();

CommPortIdentifier portId;
while (portList.hasMoreElements()) {
Expand Down

0 comments on commit ef1eb5a

Please sign in to comment.