Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21
[formerly 47cc08ac79
]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4
[formerly dbcae57f57
]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c
[formerly 941337c553
]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07
[formerly cbbdb231ce
]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Steven Harris
2f855322f6
12.11.1-1 baseline
...
Former-commit-id: 0e86bfd1d3
[formerly 618aa3f316
] [formerly 0e86bfd1d3
[formerly 618aa3f316
] [formerly feec28f274
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93
[formerly 8843ffd022
]
Former-commit-id: a544be6d83
2012-09-27 15:57:45 -05:00
Steve Harris
6ce314ca65
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
...
Former-commit-id: 22dac5c82e
[formerly 077ced354e
] [formerly 22dac5c82e
[formerly 077ced354e
] [formerly fd5e214e72
[formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: 9f3bd0d4ec
[formerly ba25027ea5
]
Former-commit-id: 2002a7cb8d
2012-09-12 13:10:36 -05:00
Steve Harris
5030894212
12.10.1-3 baseline
...
Former-commit-id: de1639aea2
[formerly 21f430062b
] [formerly de1639aea2
[formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db
[formerly 438d139fdd
]
Former-commit-id: faadb51529
2012-09-11 16:00:38 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
39ff9954f8
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e
[formerly 676ea3192f
]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Max Schenkelberg
4ddcccc3c7
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 2ef208b263
[formerly 3fe183277b
] [formerly 2ef208b263
[formerly 3fe183277b
] [formerly e3d6962fe6
[formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: 338f80fa87
[formerly 878de45ee6
]
Former-commit-id: 9f72069996
2012-05-01 18:36:09 -05:00
Steve Harris
491aa53a0c
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 4ec294b525
[formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131
[formerly 6dd3ee8809
]
Former-commit-id: fd9e226b35
2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Max Schenkelberg
33d08f1496
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e03ee60c75
[formerly 1294fa0ca1
] [formerly e03ee60c75
[formerly 1294fa0ca1
] [formerly 90a5c20b5a
[formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 51a826384e
[formerly 65c864aff2
]
Former-commit-id: 72a27b7ae0
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: 63f11892e8
[formerly 4d7572a632
] [formerly 63f11892e8
[formerly 4d7572a632
] [formerly 625cd4262c
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be
[formerly def458753d
]
Former-commit-id: 19657ae52d
2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
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: 74458bfb73
[formerly 9b0d01f8b5
] [formerly 74458bfb73
[formerly 9b0d01f8b5
] [formerly 07cf5069ba
[formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: 4234b91d5b
[formerly 993cac891e
]
Former-commit-id: f20e674318
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: a4e4792bb5
[formerly d3ad6095b7
] [formerly a4e4792bb5
[formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9
[formerly 6aa18f74f6
]
Former-commit-id: 9fee09c9e4
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: 66eaffb9ee
[formerly 15a9245592
] [formerly 66eaffb9ee
[formerly 15a9245592
] [formerly f10f1a5319
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: bbab188fb9
[formerly ac11dd0c18
]
Former-commit-id: 2f3b9f0067
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: 10b720381b
[formerly 719f87c261
] [formerly 10b720381b
[formerly 719f87c261
] [formerly 556a270a09
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54
[formerly ba8af4dcc1
]
Former-commit-id: 682aca1dda
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: 8fb7eccb73
[formerly 6e5964df9d
] [formerly 8fb7eccb73
[formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7
[formerly cf440b3884
]
Former-commit-id: 6378e8c4ee
2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7
[formerly d43b0456d8
] [formerly 18805c68f7
[formerly d43b0456d8
] [formerly 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb
[formerly 4662ece060
]
Former-commit-id: 1303289d12
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: e2cd95d3f4
[formerly ae47d9683e
] [formerly e2cd95d3f4
[formerly ae47d9683e
] [formerly 48b6d45f00
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0
[formerly 3212cc6ebb
]
Former-commit-id: 585e979c76
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: 20481daa1b
[formerly 357dc4d88b
] [formerly 20481daa1b
[formerly 357dc4d88b
] [formerly 637c051a23
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: 88d2d2e4b6
[formerly 62f1ea0aac
]
Former-commit-id: 0b4134f364
2012-02-24 14:57:23 -06:00
Ben Steffensmeier
16d205ce9d
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: b776d953d7
[formerly 06c9d4cdcf
] [formerly b776d953d7
[formerly 06c9d4cdcf
] [formerly 55aa66a510
[formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: c3d3142bab
[formerly 5d6b036ed7
]
Former-commit-id: 8f34946969
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: 27973ec694
[formerly 69e8cde115
] [formerly 27973ec694
[formerly 69e8cde115
] [formerly 73d24fad2f
[formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 0ee68fb6cc
[formerly dcbe4fc7da
]
Former-commit-id: f949f622dd
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: ddd5ee68ad
[formerly 863fa0f635
] [formerly ddd5ee68ad
[formerly 863fa0f635
] [formerly 3f60daa9c7
[formerly b7b3a581e8291313833b20da308f5adc5a234f26]]]
Former-commit-id: 3f60daa9c7
Former-commit-id: b09c00244e
[formerly d49939ddb2
]
Former-commit-id: 6164ad39b6
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: 2306325a34
[formerly eb9062a016
] [formerly 2306325a34
[formerly eb9062a016
] [formerly 554313dcc8
[formerly 53fc5959effe94c2775627a3cd88a5c0287c22d3]]]
Former-commit-id: 554313dcc8
Former-commit-id: f8655c1887
[formerly 1e463b6d52
]
Former-commit-id: 4b26300fd3
2012-01-27 11:50:16 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00