jatria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DEV] prevent init bug

Browse Source
This commit is contained in:
Edouard DUPIN 2022-01-03 23:54:00 +01:00
parent 920ac8cb20
commit fcd755cd12
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/atriasoft/gale/context/LWJG_AWT/ContextLWJGLAWT.java
View File

@ -36,7 +36,6 @@ import org.atriasoft.gale.key.KeyKeyboard;
import org.atriasoft.gale.key.KeySpecial; import org.atriasoft.gale.key.KeySpecial;
import org.atriasoft.gale.key.KeyStatus; import org.atriasoft.gale.key.KeyStatus;
import org.atriasoft.gale.key.KeyType; import org.atriasoft.gale.key.KeyType;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.awt.AWTGLCanvas; import org.lwjgl.opengl.awt.AWTGLCanvas;
@ -101,12 +100,14 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
private Robot robot = null; private Robot robot = null;
private final List<Integer> pressedKey = new ArrayList<>(); private final List<Integer> pressedKey = new ArrayList<>();
private Boolean isInitialized = false;
public ContextLWJGLAWT(final GaleApplication application, final String[] args) { public ContextLWJGLAWT(final GaleApplication application, final String[] args) {
super(application, args); super(application, args);
System.out.println("Hello JOGL !"); System.out.println("Hello JOGL !");
initWindows(); initWindows();
start2ndThreadProcessing(); start2ndThreadProcessing();
this.isInitialized = true;
} }
private int getUniqueIndex(final KeyEvent e) { private int getUniqueIndex(final KeyEvent e) {
@ -423,7 +424,7 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
public void mouseEntered(final MouseEvent e) { public void mouseEntered(final MouseEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
//Log.info("Mouse entered:" + e.getX() + " " + e.getY()); //Log.info("Mouse entered:" + e.getX() + " " + e.getY());
this.cursorPos = new Vector2f(e.getX(), this.decoratedWindowsSize.y() -e.getY()); this.cursorPos = new Vector2f(e.getX(), this.decoratedWindowsSize.y() - e.getY());
operatingSystemSetInput(this.guiKeyBoardMode, KeyType.mouse, KeyStatus.enter, 0, this.cursorPos); operatingSystemSetInput(this.guiKeyBoardMode, KeyType.mouse, KeyStatus.enter, 0, this.cursorPos);
} }
@ -431,7 +432,7 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
public void mouseExited(final MouseEvent e) { public void mouseExited(final MouseEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
//Log.info("Mouse exited:" + e.getX() + " " + e.getY()); //Log.info("Mouse exited:" + e.getX() + " " + e.getY());
this.cursorPos = new Vector2f(e.getX(),this.decoratedWindowsSize.y() - e.getY()); this.cursorPos = new Vector2f(e.getX(), this.decoratedWindowsSize.y() - e.getY());
operatingSystemSetInput(this.guiKeyBoardMode, KeyType.mouse, KeyStatus.leave, 0, this.cursorPos); operatingSystemSetInput(this.guiKeyBoardMode, KeyType.mouse, KeyStatus.leave, 0, this.cursorPos);
//this.frame.mouseMove(e, 200, 200); //this.frame.mouseMove(e, 200, 200);
} }
@ -457,7 +458,7 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
// TODO use real size ... !!!! // TODO use real size ... !!!!
this.cursorPos = new Vector2f(e.getX(), this.decoratedWindowsSize.y() + (this.cursorSize.y() - e.getY())); this.cursorPos = new Vector2f(e.getX(), this.decoratedWindowsSize.y() + (this.cursorSize.y() - e.getY()));
} }
// For compatibility of the Android system : // For compatibility of the Android system :
boolean findOne = false; boolean findOne = false;
for (int iii = 0; iii < ContextLWJGLAWT.MAX_MANAGE_INPUT; iii++) { for (int iii = 0; iii < ContextLWJGLAWT.MAX_MANAGE_INPUT; iii++) {
if (this.inputIsPressed[iii]) { if (this.inputIsPressed[iii]) {
@ -522,7 +523,9 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
System.exit(0); System.exit(0);
return; return;
} }
ContextLWJGLAWT.this.canvas.render(); if (ContextLWJGLAWT.this.isInitialized) {
ContextLWJGLAWT.this.canvas.render();
}
// fps.toc(); // fps.toc();
// fps.draw(); // fps.draw();
SwingUtilities.invokeLater(this); SwingUtilities.invokeLater(this);
@ -564,7 +567,7 @@ public class ContextLWJGLAWT extends GaleContext implements MouseListener, Mouse
// fps.toc(); // fps.toc();
// fps.draw(); // fps.draw();
// */ // */
// //
// glfwSwapBuffers(window); // swap the color buffers // glfwSwapBuffers(window); // swap the color buffers
// glfwPollEvents(); // glfwPollEvents();
// /* // /*