Commit graph

33 commits

Author SHA1 Message Date
Steve Harris
30ba1d634e 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: fe872355a7
2013-06-10 15:17:17 -04:00
Steve Harris
b35027f661 13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 8347bed50e
2013-05-13 12:58:10 -04:00
Steve Harris
4afa41d4e7 13.3.1-17 baseline
Former-commit-id: 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: a3fe998f8f
2013-04-01 12:04:56 -05:00
Steve Harris
bc439aee4f 13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: aaac0b51e5
2013-03-25 13:27:13 -05:00
Steve Harris
47cc08ac79 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Steve Harris
dbcae57f57 13.1.2-6 baseline
Former-commit-id: 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
cbbdb231ce 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
2012-10-16 13:27:07 -05:00
Steven Harris
8843ffd022 12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
2012-09-27 15:57:45 -05:00
Steve Harris
ba25027ea5 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]
Former-commit-id: fd5e214e72
2012-09-12 13:10:36 -05:00
Steve Harris
438d139fdd 12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 969e7e6dfd
2012-09-11 16:00:38 -05:00
Steve Harris
72824561cb 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
2012-08-21 15:27:03 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
2012-06-08 13:39:48 -05:00
Max Schenkelberg
878de45ee6 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]
Former-commit-id: e3d6962fe6
2012-05-01 18:36:09 -05:00
Steve Harris
6dd3ee8809 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0

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

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 7b75b781ad
2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
2012-05-01 18:06:13 -05:00
Max Schenkelberg
65c864aff2 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]
Former-commit-id: 90a5c20b5a
2012-04-19 11:11:34 -05:00
Steve Harris
def458753d 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: 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 625cd4262c
2012-04-19 11:11:02 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
993cac891e Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]
Former-commit-id: 07cf5069ba
2012-03-30 10:51:31 -05:00
Steve Harris
6aa18f74f6 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: d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: 5cdda77afb
2012-03-30 09:50:48 -05:00
Max Schenkelberg
ac11dd0c18 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: 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]
Former-commit-id: f10f1a5319
2012-03-28 13:32:04 -05:00
Max Schenkelberg
ba8af4dcc1 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: 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]
Former-commit-id: 556a270a09
2012-03-14 18:03:44 -05:00
Max Schenkelberg
cf440b3884 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: 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]
Former-commit-id: 50765e8a34
2012-03-14 09:49:32 -05:00
Max Schenkelberg
4662ece060 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]
Former-commit-id: 89f603f448
2012-03-09 12:31:50 -06:00
Max Schenkelberg
3212cc6ebb Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]
Former-commit-id: 48b6d45f00
2012-03-01 16:59:40 -06:00
Ben Steffensmeier
62f1ea0aac Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]
Former-commit-id: 637c051a23
2012-02-24 14:57:23 -06:00
Ben Steffensmeier
5d6b036ed7 Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]
Former-commit-id: 55aa66a510
2012-02-22 17:40:48 -06:00
Ben Steffensmeier
dcbe4fc7da Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]
Former-commit-id: 73d24fad2f
2012-02-20 15:28:20 -06:00
Ben Steffensmeier
d49939ddb2 Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9

Former-commit-id: 863fa0f635 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]
Former-commit-id: 3f60daa9c7
2012-02-08 16:29:02 -06:00
Ben Steffensmeier
1e463b6d52 Issue #21 update offscreen rendering to work correctly with graphics cards that do not support luminance.
Change-Id: Id04fc4cd643840ddcf39d617d4594def9f013917

Former-commit-id: eb9062a016 [formerly 53fc5959effe94c2775627a3cd88a5c0287c22d3]
Former-commit-id: 554313dcc8
2012-01-27 11:50:16 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00