Max Schenkelberg
33d08f1496
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e03ee60c751294fa0ca1e03ee60c751294fa0ca190a5c20b5a90a5c20b5a51a826384e65c864aff272a27b7ae0
2012-04-19 11:11:34 -05:00
Steve Harris
9b8c6e395d
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 63f11892e84d7572a63263f11892e84d7572a632625cd4262c625cd4262ce86dc647bedef458753d19657ae52d
2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd67a5a68300750b7543dd67a5a683002a216f333c2a216f333ca2a6a18faea4e519f3cd8cd5974f4c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
e8bc0cfa66
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 74458bfb739b0d01f8b574458bfb739b0d01f8b507cf5069ba07cf5069ba4234b91d5b993cac891ef20e674318
2012-03-30 10:51:31 -05:00
Steve Harris
1556e72eeb
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: a4e4792bb5d3ad6095b7a4e4792bb5d3ad6095b75cdda77afb5cdda77afb9845ef53f96aa18f74f69fee09c9e4
2012-03-30 09:50:48 -05:00
Max Schenkelberg
e73e40dc78
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: 66eaffb9ee15a924559266eaffb9ee15a9245592f10f1a5319f10f1a5319bbab188fb9ac11dd0c182f3b9f0067
2012-03-28 13:32:04 -05:00
Max Schenkelberg
d585d19f48
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 10b720381b719f87c26110b720381b719f87c261556a270a09556a270a09a4b859ae54ba8af4dcc1682aca1dda
2012-03-14 18:03:44 -05:00
Max Schenkelberg
9366a5f308
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 8fb7eccb736e5964df9d8fb7eccb736e5964df9d50765e8a3450765e8a348f08fab0a7cf440b38846378e8c4ee
2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7d43b0456d818805c68f7d43b0456d889f603f44889f603f448f78b932abb4662ece0601303289d12
2012-03-09 12:31:50 -06:00
Max Schenkelberg
ae389f0b57
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4ae47d9683ee2cd95d3f4ae47d9683e48b6d45f0048b6d45f000554abdde03212cc6ebb585e979c76
2012-03-01 16:59:40 -06:00
Ben Steffensmeier
cc91522fa0
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 20481daa1b357dc4d88b20481daa1b357dc4d88b637c051a23637c051a2388d2d2e4b662f1ea0aac0b4134f364
2012-02-24 14:57:23 -06:00
Ben Steffensmeier
16d205ce9d
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: b776d953d706c9d4cdcfb776d953d706c9d4cdcf55aa66a51055aa66a510c3d3142bab5d6b036ed78f34946969
2012-02-22 17:40:48 -06:00
Ben Steffensmeier
f934ade63a
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 27973ec69469e8cde11527973ec69469e8cde11573d24fad2f73d24fad2f0ee68fb6ccdcbe4fc7daf949f622dd
2012-02-20 15:28:20 -06:00
Ben Steffensmeier
8c5e58d181
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: ddd5ee68ad863fa0f635ddd5ee68ad863fa0f6353f60daa9c73f60daa9c7b09c00244ed49939ddb26164ad39b6
2012-02-08 16:29:02 -06:00
Ben Steffensmeier
b892c4ce3f
Issue #21 update offscreen rendering to work correctly with graphics cards that do not support luminance.
...
Change-Id: Id04fc4cd643840ddcf39d617d4594def9f013917
Former-commit-id: 2306325a34eb9062a0162306325a34eb9062a016554313dcc8554313dcc8f8655c18871e463b6d524b26300fd3
2012-01-27 11:50:16 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40580e2938d766be3bec40c83e5ff474c83e5ff47482300ccdcf1faae4248421d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f712a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d8e80217e593360eb6c5f377dcd10b9
2012-01-06 08:55:05 -06:00
