Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Analyst WebApp
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
fidentis
Analyst WebApp
Commits
0a1f9fd9
There was an error fetching the commit references. Please try again later.
Commit
0a1f9fd9
authored
4 years ago
by
Radek Ošlejšek
Browse files
Options
Downloads
Patches
Plain Diff
Transformed from old javax.media.opengl to new com.jogamp.opengl
parent
2cfd3fa0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java
+5
-5
5 additions, 5 deletions
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java
GUI/src/main/java/cz/fidentis/analyst/gui/GeneralGLEventListener.java
+12
-12
12 additions, 12 deletions
.../java/cz/fidentis/analyst/gui/GeneralGLEventListener.java
with
17 additions
and
17 deletions
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java
+
5
−
5
View file @
0a1f9fd9
package
cz.fidentis.analyst.gui
;
import
com.jogamp.opengl.GLCapabilities
;
import
com.jogamp.opengl.GLEventListener
;
import
com.jogamp.opengl.GLProfile
;
import
com.jogamp.opengl.awt.GLCanvas
;
import
cz.fidentis.analyst.mesh.io.ModelFileFilter
;
import
cz.fidentis.analyst.mesh.core.MeshModel
;
import
cz.fidentis.analyst.mesh.io.MeshObjLoader
;
import
javax.media.opengl.GLCapabilities
;
import
javax.media.opengl.GLProfile
;
import
javax.media.opengl.awt.GLCanvas
;
import
com.jogamp.opengl.util.FPSAnimator
;
import
java.awt.Color
;
import
java.awt.Cursor
;
import
java.awt.Dimension
;
import
java.awt.image.BufferedImage
;
import
java.io.File
;
import
java.util.Timer
;
import
java.util.TimerTask
;
...
...
@@ -186,7 +186,7 @@ public class Canvas extends javax.swing.JPanel {
if
(
model
!=
null
)
{
// listener enables to manipulate and interact with model
listener
.
setCameraPosition
(
0
,
0
,
300
);
glCanvas
.
addGLEventListener
(
listener
);
glCanvas
.
addGLEventListener
(
(
GLEventListener
)
listener
);
listener
.
setModel
(
model
);
listener
.
rotationAndSizeRestart
();
loadModelButton
.
setVisible
(
false
);
...
...
This diff is collapsed.
Click to expand it.
GUI/src/main/java/cz/fidentis/analyst/gui/GeneralGLEventListener.java
+
12
−
12
View file @
0a1f9fd9
...
...
@@ -2,18 +2,18 @@ package cz.fidentis.analyst.gui;
import
cz.fidentis.analyst.mesh.core.MeshModel
;
import
cz.fidentis.analyst.mesh.core.MeshFacet
;
import
javax.media
.opengl.GL
;
import
static
javax
.
media
.
opengl
.
GL
.
GL_DEPTH_TEST
;
import
static
javax
.
media
.
opengl
.
GL
.
GL_FRONT_AND_BACK
;
import
static
javax
.
media
.
opengl
.
GL
.
GL_VIEWPORT
;
import
javax.media
.opengl.GL2
;
import
static
javax
.
media
.
opengl
.
GL2GL3
.
GL_FILL
;
import
static
javax
.
media
.
opengl
.
GL2GL3
.
GL_LINE
;
import
javax.media
.opengl.GLAutoDrawable
;
import
javax.media
.opengl.GLEventListener
;
import
static
javax
.
media
.
opengl
.
fixedfunc
.
GLMatrixFunc
.
GL_MODELVIEW_MATRIX
;
import
static
javax
.
media
.
opengl
.
fixedfunc
.
GLMatrixFunc
.
GL_PROJECTION_MATRIX
;
import
javax.media
.opengl.glu.GLU
;
import
com.jogamp
.opengl.GL
;
import
static
com
.
jogamp
.
opengl
.
GL
.
GL_DEPTH_TEST
;
import
static
com
.
jogamp
.
opengl
.
GL
.
GL_FRONT_AND_BACK
;
import
static
com
.
jogamp
.
opengl
.
GL
.
GL_VIEWPORT
;
import
com.jogamp
.opengl.GL2
;
import
static
com
.
jogamp
.
opengl
.
GL2GL3
.
GL_FILL
;
import
static
com
.
jogamp
.
opengl
.
GL2GL3
.
GL_LINE
;
import
com.jogamp
.opengl.GLAutoDrawable
;
import
com.jogamp
.opengl.GLEventListener
;
import
static
com
.
jogamp
.
opengl
.
fixedfunc
.
GLMatrixFunc
.
GL_MODELVIEW_MATRIX
;
import
static
com
.
jogamp
.
opengl
.
fixedfunc
.
GLMatrixFunc
.
GL_PROJECTION_MATRIX
;
import
com.jogamp
.opengl.glu.GLU
;
import
javax.vecmath.Vector3d
;
import
javax.vecmath.Vector3f
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment