21 commits

Author	SHA1	Message	Date
Steve Harris	97c4db937e	12.5.1-15 baseline ... Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]] Former-commit-id: 3904c4ccf5 Former-commit-id: 676ea3192f	2012-06-08 13:39:48 -05:00
Max Schenkelberg	338f80fa87	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 2ef208b263 [formerly 3fe183277b] [formerly e3d6962fe6 [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]] Former-commit-id: e3d6962fe6 Former-commit-id: 878de45ee6	2012-05-01 18:36:09 -05:00
Steve Harris	7c7fc97131	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: 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]] Former-commit-id: 7b75b781ad Former-commit-id: 6dd3ee8809	2012-05-01 18:31:09 -05:00
Steve Harris	33a67cdd82	12.4.1-10 baseline ... Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 8485b90ff8 Former-commit-id: a28d70b5c5	2012-05-01 18:06:13 -05:00
Max Schenkelberg	51a826384e	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: e03ee60c75 [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly bd93246cccd1b123598006d7343eac265392695d]] Former-commit-id: 90a5c20b5a Former-commit-id: 65c864aff2	2012-04-19 11:11:34 -05:00
Steve Harris	e86dc647be	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: 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]] Former-commit-id: 625cd4262c Former-commit-id: def458753d	2012-04-19 11:11:02 -05:00
Steve Harris	a2a6a18fae	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Max Schenkelberg	4234b91d5b	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 74458bfb73 [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]] Former-commit-id: 07cf5069ba Former-commit-id: 993cac891e	2012-03-30 10:51:31 -05:00
Steve Harris	9845ef53f9	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: a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]] Former-commit-id: 5cdda77afb Former-commit-id: 6aa18f74f6	2012-03-30 09:50:48 -05:00
Max Schenkelberg	bbab188fb9	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: 66eaffb9ee [formerly 15a9245592] [formerly f10f1a5319 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]] Former-commit-id: f10f1a5319 Former-commit-id: ac11dd0c18	2012-03-28 13:32:04 -05:00
Max Schenkelberg	a4b859ae54	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: 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]] Former-commit-id: 556a270a09 Former-commit-id: ba8af4dcc1	2012-03-14 18:03:44 -05:00
Max Schenkelberg	8f08fab0a7	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: 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]] Former-commit-id: 50765e8a34 Former-commit-id: cf440b3884	2012-03-14 09:49:32 -05:00
Max Schenkelberg	f78b932abb	Issue #358 Merging core drawing API improvements from Collaboration ... Former-commit-id: 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]] Former-commit-id: 89f603f448 Former-commit-id: 4662ece060	2012-03-09 12:31:50 -06:00
Max Schenkelberg	0554abdde0	Issue #358 Committing NPP core rendering improvements merged with Thin ... Client core improvements Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]] Former-commit-id: 48b6d45f00 Former-commit-id: 3212cc6ebb	2012-03-01 16:59:40 -06:00
Ben Steffensmeier	88d2d2e4b6	Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target ... Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2 Former-commit-id: 20481daa1b [formerly 357dc4d88b] [formerly 637c051a23 [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]] Former-commit-id: 637c051a23 Former-commit-id: 62f1ea0aac	2012-02-24 14:57:23 -06:00
Ben Steffensmeier	c3d3142bab	Issue #345 allow double dispose of GLTarget ... Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be Former-commit-id: b776d953d7 [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]] Former-commit-id: 55aa66a510 Former-commit-id: 5d6b036ed7	2012-02-22 17:40:48 -06:00
Ben Steffensmeier	0ee68fb6cc	Issue #345 fix issues with gl contexts and creation and deletion of gl objects! ... Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db Former-commit-id: 27973ec694 [formerly 69e8cde115] [formerly 73d24fad2f [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]] Former-commit-id: 73d24fad2f Former-commit-id: dcbe4fc7da	2012-02-20 15:28:20 -06:00
Ben Steffensmeier	b09c00244e	Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled ... Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9 Former-commit-id: ddd5ee68ad [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]] Former-commit-id: 3f60daa9c7 Former-commit-id: d49939ddb2	2012-02-08 16:29:02 -06:00
Ben Steffensmeier	f8655c1887	Issue #21 update offscreen rendering to work correctly with graphics cards that do not support luminance. ... Change-Id: Id04fc4cd643840ddcf39d617d4594def9f013917 Former-commit-id: 2306325a34 [formerly eb9062a016] [formerly 554313dcc8 [formerly 53fc5959effe94c2775627a3cd88a5c0287c22d3]] Former-commit-id: 554313dcc8 Former-commit-id: 1e463b6d52	2012-01-27 11:50:16 -06:00
Matt Nash	82300ccdcf	Moving 12.1.1 into ss_sync ... Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484	2012-01-19 11:53:12 -06:00
root	8e80217e59	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f	2012-01-06 08:55:05 -06:00