From 9f3c8ae6228557076d2908699632dab7fc3ead67 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 25 Apr 2017 10:31:06 -0600 Subject: [PATCH] OSX ui merge --- cave/com.raytheon.uf.viz.alertview/plugin.xml | 2 +- cave/com.raytheon.uf.viz.archive/plugin.xml | 2 +- .../com.raytheon.uf.viz.d2d.nsharp/plugin.xml | 2 +- .../plugin.xml | 10 -- cave/com.raytheon.uf.viz.d2d.ui/plugin.xml | 134 +++++------------- .../com.raytheon.uf.viz.damagepath/plugin.xml | 11 -- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../gl/triangulated/GLTriangulatedImage.java | 71 ++++------ .../com.raytheon.uf.viz.kml.export/plugin.xml | 9 ++ .../plugin.xml | 7 - .../plugin.xml | 10 -- .../plugin.xml | 10 -- .../plugin.xml | 17 --- .../plugin.xml | 10 -- cave/com.raytheon.uf.viz.radar.gl/.classpath | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../uf/viz/radar/gl/RadarRadialMesh.java | 4 +- .../plugin.xml | 11 ++ cave/com.raytheon.uf.viz.stats/plugin.xml | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../GLTrueColorImagingExtension.java | 32 ++--- cave/com.raytheon.uf.viz.useradmin/plugin.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- cave/com.raytheon.viz.bcd/plugin.xml | 2 +- cave/com.raytheon.viz.gfe/plugin.xml | 67 +-------- cave/com.raytheon.viz.lpi/plugin.xml | 4 +- cave/com.raytheon.viz.mpe.ui/plugin.xml | 16 --- .../developer.product | 4 +- cave/com.raytheon.viz.satellite/plugin.xml | 7 + 31 files changed, 138 insertions(+), 334 deletions(-) diff --git a/cave/com.raytheon.uf.viz.alertview/plugin.xml b/cave/com.raytheon.uf.viz.alertview/plugin.xml index 2ff4c8da2f..e44431646c 100644 --- a/cave/com.raytheon.uf.viz.alertview/plugin.xml +++ b/cave/com.raytheon.uf.viz.alertview/plugin.xml @@ -15,7 +15,7 @@ + locationURI="menu:d2dFile?after=afterNewGroup"> + locationURI="menu:d2dFile?after=group1"> diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml index 7e66d5276a..f82ec3b322 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml @@ -18,7 +18,7 @@ restorable="false" class="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow" id="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow" - name="NSHARP(D2D)"/> + name="NSHARP"/> diff --git a/cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml index 4343b2e566..0c5fbb8c6a 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml @@ -20,16 +20,6 @@ --> - - - - + locationURI="menu:org.eclipse.ui.main.menu"> - - - - - - - - - - @@ -154,6 +131,30 @@ value="current"> + + + + + + + + + + + + - - - - - - - - - - @@ -629,24 +610,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - diff --git a/cave/com.raytheon.uf.viz.gl.triangulated/.classpath b/cave/com.raytheon.uf.viz.gl.triangulated/.classpath index 098194ca4b..eca7bdba8f 100644 --- a/cave/com.raytheon.uf.viz.gl.triangulated/.classpath +++ b/cave/com.raytheon.uf.viz.gl.triangulated/.classpath @@ -1,6 +1,6 @@ - + diff --git a/cave/com.raytheon.uf.viz.gl.triangulated/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.gl.triangulated/META-INF/MANIFEST.MF index 411d64a221..26858cd616 100644 --- a/cave/com.raytheon.uf.viz.gl.triangulated/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.gl.triangulated/META-INF/MANIFEST.MF @@ -4,11 +4,13 @@ Bundle-Name: OpenGL Triangulated Image Rendering Bundle-SymbolicName: com.raytheon.uf.viz.gl.triangulated;singleton:=true Bundle-Version: 1.15.0.qualifier Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.raytheon.uf.viz.drawables.triangulated;bundle-version="1.15.0", com.raytheon.uf.viz.core;bundle-version="1.15.1", com.raytheon.uf.common.colormap;bundle-version="1.15.0", com.raytheon.viz.core.gl;bundle-version="1.15.1", - javax.measure;bundle-version="1.0.0" -Import-Package: com.vividsolutions.jts.algorithm, + javax.measure;bundle-version="1.0.0", + com.jogamp.jogl +Import-Package: com.jogamp.opengl, + com.vividsolutions.jts.algorithm, com.vividsolutions.jts.geom diff --git a/cave/com.raytheon.uf.viz.gl.triangulated/src/com/raytheon/uf/viz/gl/triangulated/GLTriangulatedImage.java b/cave/com.raytheon.uf.viz.gl.triangulated/src/com/raytheon/uf/viz/gl/triangulated/GLTriangulatedImage.java index 43458d9a75..7190f9adb3 100644 --- a/cave/com.raytheon.uf.viz.gl.triangulated/src/com/raytheon/uf/viz/gl/triangulated/GLTriangulatedImage.java +++ b/cave/com.raytheon.uf.viz.gl.triangulated/src/com/raytheon/uf/viz/gl/triangulated/GLTriangulatedImage.java @@ -26,7 +26,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import javax.measure.unit.Unit; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL2; import com.raytheon.uf.common.colormap.image.ColorMapData; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; @@ -40,7 +40,6 @@ import com.raytheon.viz.core.gl.IGLTarget; import com.raytheon.viz.core.gl.dataformat.AbstractGLColorMapDataFormat; import com.raytheon.viz.core.gl.dataformat.GLBufferColorMapData; import com.raytheon.viz.core.gl.dataformat.GLColorMapDataFormatFactory; -import com.raytheon.viz.core.gl.ext.imaging.AbstractGLImagingExtension; import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory; import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory.GLDataMapping; import com.raytheon.viz.core.gl.glsl.GLSLFactory; @@ -84,7 +83,7 @@ import com.vividsolutions.jts.geom.Triangle; * ------------- -------- --------- --------------------------------- * Aug 24, 2015 4709 bsteffen Initial creation * Dec 04, 2015 5146 bsteffen Rewind attrib buffer before use. - * May 19, 2016 5146 bsteffen Add debug code for drawing triangles. + * Sep 13, 2016 mjames@ucar jogamp refactor for osx * * * @@ -92,8 +91,6 @@ import com.vividsolutions.jts.geom.Triangle; */ public class GLTriangulatedImage implements ITriangulatedImage { - private static final boolean SHOW_MESH_LINES = AbstractGLImagingExtension.SHOW_MESH_LINES; - protected final ITriangleLocationCallback locations; protected final IColorMapDataRetrievalCallback dataCallback; @@ -200,35 +197,35 @@ public class GLTriangulatedImage implements ITriangulatedImage { if (this.indexBuffer == null) { stage(); } - GL gl = target.getGl(); + GL2 gl = target.getGl(); target.pushGLState(); try { - gl.glPolygonMode(GL.GL_BACK, GL.GL_FILL); - gl.glPolygonMode(GL.GL_FRONT, GL.GL_FILL); + gl.glPolygonMode(GL2.GL_BACK, GL2.GL_FILL); + gl.glPolygonMode(GL2.GL_FRONT, GL2.GL_FILL); - gl.glEnable(GL.GL_BLEND); - gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); + gl.glEnable(GL2.GL_BLEND); + gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA); GLTextureObject cmapTexture = target .getColorMapTexture(colorMapParameters); - gl.glActiveTexture(GL.GL_TEXTURE1); - cmapTexture.bind(gl, GL.GL_TEXTURE_1D); + gl.glActiveTexture(GL2.GL_TEXTURE1); + cmapTexture.bind(gl, GL2.GL_TEXTURE_1D); if (colorMapParameters.isInterpolate()) { - gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MIN_FILTER, - GL.GL_LINEAR); - gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MAG_FILTER, - GL.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, + GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, + GL2.GL_LINEAR); } else { - gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MIN_FILTER, - GL.GL_NEAREST); - gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MAG_FILTER, - GL.GL_NEAREST); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, + GL2.GL_NEAREST); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, + GL2.GL_NEAREST); } - setupDataMapping(gl, GL.GL_TEXTURE3, GL.GL_TEXTURE4); + setupDataMapping(gl, GL2.GL_TEXTURE3, GL2.GL_TEXTURE4); GLShaderProgram program = GLSLFactory.getInstance() .getShaderProgram(gl, "copyValueVertexShader", @@ -248,9 +245,9 @@ public class GLTriangulatedImage implements ITriangulatedImage { GLSLStructFactory.createColorModifiers(program, "modifiers", paintProps.getAlpha(), brightness, contrast); - gl.glEnableClientState(GL.GL_VERTEX_ARRAY); + gl.glEnableClientState(GL2.GL_VERTEX_ARRAY); vertexBuffer.rewind(); - gl.glVertexPointer(2, GL.GL_FLOAT, 0, vertexBuffer); + gl.glVertexPointer(2, GL2.GL_FLOAT, 0, vertexBuffer); Buffer attribBufferData = attribBuffer.getData(); attribBufferData.rewind(); @@ -258,37 +255,23 @@ public class GLTriangulatedImage implements ITriangulatedImage { attribBuffer.getTextureType(), attribBufferData); indexBuffer.rewind(); - gl.glDrawElements(GL.GL_TRIANGLES, indexBuffer.capacity(), - GL.GL_UNSIGNED_INT, indexBuffer); + gl.glDrawElements(GL2.GL_TRIANGLES, indexBuffer.capacity(), + GL2.GL_UNSIGNED_INT, indexBuffer); program.endShader(); - if (SHOW_MESH_LINES) { - /* - * This block can be enabled to see the triangles rendered as - * lines on top of the image for debugging. - */ - indexBuffer.rewind(); - gl.glDisable(GL.GL_BLEND); - gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL.GL_LINE); - gl.glDrawElements(GL.GL_TRIANGLES, indexBuffer.capacity(), - GL.GL_UNSIGNED_INT, indexBuffer); - gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL.GL_FILL); - gl.glEnable(GL.GL_BLEND); - } + gl.glDisableClientState(GL2.GL_VERTEX_ARRAY); - gl.glDisableClientState(GL.GL_VERTEX_ARRAY); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glBindTexture(GL2.GL_TEXTURE_1D, 0); - gl.glActiveTexture(GL.GL_TEXTURE1); - gl.glBindTexture(GL.GL_TEXTURE_1D, 0); - - gl.glDisable(GL.GL_BLEND); + gl.glDisable(GL2.GL_BLEND); } finally { target.popGLState(); } } - protected void setupDataMapping(GL gl, + protected void setupDataMapping(GL2 gl, int dataMappedTexBinding, int colorMappedTexBinding) throws VizException { if (dataMapping == null && colorMapParameters.getColorMap() != null) { diff --git a/cave/com.raytheon.uf.viz.kml.export/plugin.xml b/cave/com.raytheon.uf.viz.kml.export/plugin.xml index a819c1f438..b128b6b00c 100644 --- a/cave/com.raytheon.uf.viz.kml.export/plugin.xml +++ b/cave/com.raytheon.uf.viz.kml.export/plugin.xml @@ -42,4 +42,13 @@ class="com.raytheon.uf.viz.kml.export.graphics.ext.KmlCanvasRenderingExtension"> + + + + diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml b/cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml index dd2a720c74..f65335a006 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml @@ -108,13 +108,6 @@ recursive="true" value="ffmp"> - - - - - - diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml b/cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml index f0ccff12b0..467dfb3140 100644 --- a/cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml +++ b/cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml @@ -62,14 +62,4 @@ commandId="com.raytheon.uf.viz.monitor.safeseas.ui.actions.safeseasThresholdAlertVisConfig"> - - - - diff --git a/cave/com.raytheon.uf.viz.monitor.scan/plugin.xml b/cave/com.raytheon.uf.viz.monitor.scan/plugin.xml index 40c3992731..f356fa394f 100644 --- a/cave/com.raytheon.uf.viz.monitor.scan/plugin.xml +++ b/cave/com.raytheon.uf.viz.monitor.scan/plugin.xml @@ -44,21 +44,4 @@ renderingOrderId="CONTOUR"> - - - - - - diff --git a/cave/com.raytheon.uf.viz.monitor.snow/plugin.xml b/cave/com.raytheon.uf.viz.monitor.snow/plugin.xml index 095074b30e..d40e36e72f 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/plugin.xml +++ b/cave/com.raytheon.uf.viz.monitor.snow/plugin.xml @@ -62,14 +62,4 @@ commandId="com.raytheon.uf.viz.monitor.snow.ui.actions.snowThresholdAlertVisConfig"> - - - - diff --git a/cave/com.raytheon.uf.viz.radar.gl/.classpath b/cave/com.raytheon.uf.viz.radar.gl/.classpath index 098194ca4b..eca7bdba8f 100644 --- a/cave/com.raytheon.uf.viz.radar.gl/.classpath +++ b/cave/com.raytheon.uf.viz.radar.gl/.classpath @@ -1,6 +1,6 @@ - + diff --git a/cave/com.raytheon.uf.viz.radar.gl/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.radar.gl/META-INF/MANIFEST.MF index 71894d33d6..9b561fa023 100644 --- a/cave/com.raytheon.uf.viz.radar.gl/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.radar.gl/META-INF/MANIFEST.MF @@ -8,5 +8,6 @@ Require-Bundle: com.raytheon.viz.radar;bundle-version="1.14", com.raytheon.viz.core.gl;bundle-version="1.14", com.raytheon.uf.viz.core;bundle-version="1.14", com.raytheon.uf.common.geospatial;bundle-version="1.14" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Import-Package: com.jogamp.opengl diff --git a/cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/RadarRadialMesh.java b/cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/RadarRadialMesh.java index 64ef650284..c6817679a9 100644 --- a/cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/RadarRadialMesh.java +++ b/cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/RadarRadialMesh.java @@ -22,7 +22,7 @@ package com.raytheon.uf.viz.radar.gl; import java.util.HashMap; import java.util.Map; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL2; import org.geotools.coverage.grid.GeneralGridGeometry; import org.geotools.coverage.grid.GridGeometry2D; @@ -117,7 +117,7 @@ public class RadarRadialMesh extends AbstractGLMesh { public RadarRadialMesh(RadialMeshData data, GeneralGridGeometry targetGeometry, CacheKey cacheKey) throws VizException { - super(GL.GL_TRIANGLE_STRIP); + super(GL2.GL_TRIANGLE_STRIP); this.data = data; this.cacheKey = cacheKey; ProjectedCRS crs = CRSCache.getInstance().constructStereographic( diff --git a/cave/com.raytheon.uf.viz.spellchecker/plugin.xml b/cave/com.raytheon.uf.viz.spellchecker/plugin.xml index e4e4b43350..8718a12894 100644 --- a/cave/com.raytheon.uf.viz.spellchecker/plugin.xml +++ b/cave/com.raytheon.uf.viz.spellchecker/plugin.xml @@ -20,4 +20,15 @@ --> + + + + diff --git a/cave/com.raytheon.uf.viz.stats/plugin.xml b/cave/com.raytheon.uf.viz.stats/plugin.xml index 0c3c85699f..386ec7c064 100644 --- a/cave/com.raytheon.uf.viz.stats/plugin.xml +++ b/cave/com.raytheon.uf.viz.stats/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> + locationURI="menu:d2dFile?after=group1"> - + diff --git a/cave/com.raytheon.uf.viz.truecolor.gl/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.truecolor.gl/META-INF/MANIFEST.MF index 4440486a67..882d978c04 100644 --- a/cave/com.raytheon.uf.viz.truecolor.gl/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.truecolor.gl/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Require-Bundle: org.eclipse.core.runtime, com.raytheon.uf.viz.core;bundle-version="1.12.1174", com.raytheon.uf.viz.truecolor;bundle-version="1.0.0", com.raytheon.viz.core.gl;bundle-version="1.12.1174", - javax.media.opengl;bundle-version="1.1.0", com.raytheon.uf.common.util;bundle-version="1.12.1174", - com.raytheon.uf.common.colormap;bundle-version="1.12.1174" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + com.raytheon.uf.common.colormap;bundle-version="1.12.1174", + com.jogamp.jogl;bundle-version="2.3.2" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: com.raytheon.uf.viz.truecolor.gl.jar diff --git a/cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java b/cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java index 2f6ad42f1c..cd46bd09ee 100644 --- a/cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java +++ b/cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java @@ -22,7 +22,7 @@ package com.raytheon.uf.viz.truecolor.gl.extension; import java.util.IdentityHashMap; import java.util.Map; -import javax.media.opengl.GL; +import com.jogamp.opengl.GL2; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; import com.raytheon.uf.viz.core.DrawableImage; @@ -54,7 +54,7 @@ import com.raytheon.viz.core.gl.images.AbstractGLImage; * ------------ ---------- ----------- -------------------------- * Aug 6, 2012 mschenke Initial creation * Nov 4, 2013 2492 mschenke Reworked to use GLSL Data mapping - * Jan 27, 2016 DR 17997 jgerth Support for gamma control + * Jun 2, 2016 mjames@ucar Refactored for jogamp 2 for OS X * * * @@ -69,8 +69,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension private Channel renderingChannel; - private double renderingGamma = 1.0; - private Map parameters = new IdentityHashMap(); /* @@ -125,7 +123,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension boolean allPainted = true; for (Channel channel : Channel.values()) { renderingChannel = channel; - renderingGamma = trueColorImage.getGamma(channel); DrawableImage[] imagesToDraw = trueColorImage .getImages(channel); if (imagesToDraw != null && imagesToDraw.length > 0) { @@ -151,7 +148,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension throw e; } renderingChannel = null; - renderingGamma = 1.0; writeToImage = null; trueColorImage.setImageParameters(parameters.keySet()); trueColorImage.bind(target.getGl()); @@ -163,13 +159,13 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension return null; } } else if (image instanceof AbstractGLColormappedImage) { - GL gl = target.getGl(); + GL2 gl = target.getGl(); GLColormappedImageExtension.setupDataMapping(gl, - (AbstractGLColormappedImage) image, GL.GL_TEXTURE2, - GL.GL_TEXTURE3); + (AbstractGLColormappedImage) image, GL2.GL_TEXTURE2, + GL2.GL_TEXTURE3); // bind on GL_TEXTURE1 as 0 is channel image - writeToImage.bind(gl, GL.GL_TEXTURE1); + writeToImage.bind(gl, GL2.GL_TEXTURE1); return image; } return null; @@ -193,17 +189,17 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension ((GLTrueColorImage) image).getWrappedImage(), (PixelCoverage) data)); } else if (writeToImage != null) { - GL gl = target.getGl(); + GL2 gl = target.getGl(); // Unbind the writeToImage from GL_TEXTURE1 - gl.glActiveTexture(GL.GL_TEXTURE1); + gl.glActiveTexture(GL2.GL_TEXTURE1); gl.glBindTexture(writeToImage.getTextureStorageType(), 0); // Unbind the data mapped textures - gl.glActiveTexture(GL.GL_TEXTURE2); - gl.glBindTexture(GL.GL_TEXTURE_1D, 0); + gl.glActiveTexture(GL2.GL_TEXTURE2); + gl.glBindTexture(GL2.GL_TEXTURE_1D, 0); - gl.glActiveTexture(GL.GL_TEXTURE3); - gl.glBindTexture(GL.GL_TEXTURE_1D, 0); + gl.glActiveTexture(GL2.GL_TEXTURE3); + gl.glBindTexture(GL2.GL_TEXTURE_1D, 0); } } @@ -250,8 +246,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension GLSLStructFactory.createColorMapping(program, "colorMapping", -1, -1, colorMapParameters); - program.setUniform("gamma", renderingGamma); - // Set the composite image data program.setUniform("trueColorTexture", 1); program.setUniform("width", (float) writeToImage.getWidth()); @@ -270,7 +264,7 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension * (javax.media.opengl.GL) */ @Override - protected void enableBlending(GL gl) { + protected void enableBlending(GL2 gl) { // Do not enable blending for this extension as it messes with alpha // values between passes } diff --git a/cave/com.raytheon.uf.viz.useradmin/plugin.xml b/cave/com.raytheon.uf.viz.useradmin/plugin.xml index 0d4e87d34c..64866ea2a5 100644 --- a/cave/com.raytheon.uf.viz.useradmin/plugin.xml +++ b/cave/com.raytheon.uf.viz.useradmin/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> + locationURI="menu:d2dFile?after=group1"> diff --git a/cave/com.raytheon.viz.gfe/plugin.xml b/cave/com.raytheon.viz.gfe/plugin.xml index f60639723d..f126a76083 100644 --- a/cave/com.raytheon.viz.gfe/plugin.xml +++ b/cave/com.raytheon.viz.gfe/plugin.xml @@ -1924,7 +1924,7 @@ @@ -1956,7 +1956,7 @@ @@ -1964,7 +1964,7 @@ @@ -1972,7 +1972,7 @@ @@ -2017,61 +2017,6 @@ recursive="true" value="gfe/weGroups"> - - - - - - - - - - - - - - - diff --git a/cave/com.raytheon.viz.mpe.ui/plugin.xml b/cave/com.raytheon.viz.mpe.ui/plugin.xml index 77b23c96c5..d633da7a44 100644 --- a/cave/com.raytheon.viz.mpe.ui/plugin.xml +++ b/cave/com.raytheon.viz.mpe.ui/plugin.xml @@ -1819,22 +1819,6 @@ - - - - - - diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product index b5c8f6e302..3ad57d9fc5 100644 --- a/cave/com.raytheon.viz.product.awips/developer.product +++ b/cave/com.raytheon.viz.product.awips/developer.product @@ -14,7 +14,7 @@ - -data @user.home/caveData -user @user.home/caveData -clean -consoleLog -component thinclient -alertviz + -data @user.home/Library/caveData -user @user.home/Library/caveData -clean -consoleLog -component thinclient -alertviz -Xmx4536M -XX:+UseG1GC @@ -24,7 +24,7 @@ -Dqpid.dest_syntax=BURL -Dlogback.configurationFile=logback-viz-core-developer.xml -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener --Dthrift.stream.maxsize=200 +-Dthrift.stream.maxsize=800 -Dviz.memory.warn.threshold=99 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false -Dhttps.certificate.check=false diff --git a/cave/com.raytheon.viz.satellite/plugin.xml b/cave/com.raytheon.viz.satellite/plugin.xml index 851cc23fb8..80766686b4 100644 --- a/cave/com.raytheon.viz.satellite/plugin.xml +++ b/cave/com.raytheon.viz.satellite/plugin.xml @@ -71,4 +71,11 @@ sortID="4"> + + + +