Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
8603b83
Initial library bindings for LWJGL
TheTimurid May 13, 2020
fcc9c55
Early WIP attempt to switch JOGL to LWJGL/GL
TheTimurid May 17, 2020
e4e1d6d
WIP
TheTimurid May 18, 2020
1162aba
fixed the windows natives jars for LWJGL (now windows dlls will load)
hydra41 May 18, 2020
2f645ae
WIP
TheTimurid May 19, 2020
e61dd28
A rectangle is rendering using the ConstellationCanvas (AVTCanvas) in…
TheTimurid May 19, 2020
5b64dd6
WIP. Another refactoring pass.
TheTimurid May 20, 2020
58073e5
WIP
TheTimurid May 20, 2020
792b2a1
Migrate to Vulkan WIP
TheTimurid May 24, 2020
d79b50a
WIP
TheTimurid May 28, 2020
8cd9815
WIP
TheTimurid Jun 2, 2020
36c2cb3
WIP
TheTimurid Jun 4, 2020
afa91f0
WIP
TheTimurid Jun 6, 2020
bdf1ec2
WIP
TheTimurid Jun 8, 2020
2ada754
Updated project properties to include macos and linux native jars
hydra41 Jun 11, 2020
9155221
WIP
TheTimurid Jun 11, 2020
01dc8b0
WIP
TheTimurid Jun 14, 2020
67ed892
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 14, 2020
06b874f
WIP
TheTimurid Jun 15, 2020
822e432
WIP
TheTimurid Jun 15, 2020
cfb854f
WIP
TheTimurid Jun 15, 2020
af5fa81
Added shader utils class
hydra41 Jun 15, 2020
b1191d6
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 15, 2020
460aa70
WIP
TheTimurid Jun 16, 2020
42be28c
WIP
TheTimurid Jun 16, 2020
5196dcc
AxesRendererable WIP
hydra41 Jun 16, 2020
c45fc13
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jun 16, 2020
79eaaf4
Added code to compile shaders relative to a class, AxesRenderable WIP
hydra41 Jun 16, 2020
dde8481
WIP
TheTimurid Jun 18, 2020
ad038f6
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 18, 2020
466e760
WIP
TheTimurid Jun 19, 2020
a447d18
Added first pass at multiple objects rendering WIP
hydra41 Jun 19, 2020
c4c41d5
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jun 19, 2020
eb8fdd6
Added a triangle rendering from AxesRenderable, using the command buf…
hydra41 Jun 20, 2020
b1d3613
WIP
TheTimurid Jun 21, 2020
cc54246
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 21, 2020
c0dbce9
Secondary command buffers working for FPSRenderable
hydra41 Jun 24, 2020
f9a3c01
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jun 24, 2020
ee4e4c8
WIP
TheTimurid Jun 25, 2020
4e16d84
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jun 25, 2020
8b0eac3
WIP
TheTimurid Jun 25, 2020
9a1a9f5
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 25, 2020
ae98fa8
Fixed a crash when resizing: (due to AxesRenderable destroying the sh…
hydra41 Jun 25, 2020
4791dad
WIP
TheTimurid Jun 25, 2020
524d5b7
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 25, 2020
b520583
WIP
TheTimurid Jun 25, 2020
32efd92
Fix crash in window resize (shaders were being deleted after initial …
hydra41 Jun 26, 2020
4239e33
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jun 26, 2020
ed7467e
WIP
TheTimurid Jun 26, 2020
c6d142d
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jun 26, 2020
52ca19e
WIP
TheTimurid Jun 27, 2020
fa118fe
WIP
TheTimurid Jun 27, 2020
884ccaa
WIP
TheTimurid Jun 29, 2020
fe5cea7
Refactored renderables code:
hydra41 Jul 1, 2020
0eff7af
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 1, 2020
1fbcab9
Added Destroy pipeline code to FPSRenderable
hydra41 Jul 1, 2020
81c4fa7
Merge branch 'master' into feature/Migrate-renderer-to-Vulkan
TheTimurid Jul 1, 2020
f59da48
WIP
TheTimurid Jul 1, 2020
3593b5c
Changed ProjectUpdater build file to work with parent folders that ar…
hydra41 Jul 1, 2020
e502ab3
Change Axes to 3D renderable WIP
hydra41 Jul 1, 2020
1e00153
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 2, 2020
b772c0e
Bit more cleanup work on the Renderables
hydra41 Jul 13, 2020
e1c9988
WIP
TheTimurid Jul 13, 2020
e45d461
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jul 13, 2020
8871037
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 13, 2020
a4911b2
WIP
TheTimurid Jul 13, 2020
42d2c91
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 13, 2020
f7aa8a7
Fixed merge issues and crash in resizing window (double free issue)
hydra41 Jul 13, 2020
4ee990f
WIP
TheTimurid Jul 13, 2020
a0e1228
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jul 14, 2020
042bacf
WIP/depth-attachment-creation
TheTimurid Jul 15, 2020
3bdca83
Merge pull request #1 from TheTimurid/WIP/depth-attachment-creation
TheTimurid Jul 15, 2020
883f126
Converted Axes renderable from the triangle to the Axes.
hydra41 Jul 16, 2020
3eb5f4a
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 16, 2020
a8dab47
WIP
TheTimurid Jul 20, 2020
a5a5458
Converted Axes renderable from the triangle to the Axes. (#2)
hydra41 Jul 20, 2020
87ba35a
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jul 20, 2020
81cada6
Converted Axes renderable from the triangle to the Axes. (#3)
hydra41 Jul 20, 2020
078b1a2
WIP
TheTimurid Jul 20, 2020
5254913
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Jul 20, 2020
78be6d4
WIP
TheTimurid Jul 20, 2020
3b8b789
Merge branch 'feature/Migrate-renderer-to-Vulkan' of https://github.c…
hydra41 Jul 20, 2020
afd8ac5
WIP
TheTimurid Jul 20, 2020
a01ae62
Hooked camera up to the AxesRenderable so rotation works with mouse i…
hydra41 Jul 21, 2020
d8332c8
WIP
TheTimurid Jul 21, 2020
377d7e7
Merge branch 'feature/Migrate-renderer-to-Vulkan' into changes/IconsR…
TheTimurid Jul 21, 2020
223c64d
Fixed issue with resize not recreating swapchain if drivers are out o…
hydra41 Jul 23, 2020
226f758
WIP
TheTimurid Jul 21, 2020
4f7d506
WIP
TheTimurid Jul 24, 2020
0fc3dcf
Merge pull request #5 from TheTimurid/changes/IconsRenderable
TheTimurid Jul 27, 2020
47e5749
WIP
TheTimurid Jul 27, 2020
e784f23
Fixed multiple graphs crashing
hydra41 Jul 27, 2020
1eb855b
Fixed multiple graphs crashing
hydra41 Jul 27, 2020
7f7f863
Merge branch 'fix/multiple-graph-crash' of https://github.com/TheTimu…
hydra41 Jul 29, 2020
7409372
Merge pull request #6 from TheTimurid/fix/multiple-graph-crash
TheTimurid Jul 29, 2020
09cb7d0
WIP
TheTimurid Jul 29, 2020
d4ed359
Merge branch 'feature/Migrate-renderer-to-Vulkan' into tasks/5-pull-d…
TheTimurid Jul 29, 2020
88134f3
Merge pull request #7 from TheTimurid/tasks/5-pull-descriptorpool-out…
TheTimurid Jul 29, 2020
2861b12
WIP
TheTimurid Jul 30, 2020
73cfa34
Changes/axes renderable push constants (#8)
hydra41 Aug 3, 2020
2240268
WIP
TheTimurid Aug 3, 2020
893a7b0
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Aug 3, 2020
582ae1d
WIP
TheTimurid Aug 3, 2020
5caf781
Merge pull request #9 from TheTimurid/changes/CVKIconsRenderable
TheTimurid Aug 6, 2020
a776099
WIP
TheTimurid Aug 9, 2020
9a722e8
Merge pull request #10 from TheTimurid/feature/Migrate-renderer-to-Vu…
TheTimurid Aug 9, 2020
b1a5109
Merge pull request #11 from TheTimurid/changes/CVKIconsRenderable
TheTimurid Aug 10, 2020
3670f59
WIP
TheTimurid Aug 11, 2020
245d601
WIP
TheTimurid Aug 19, 2020
0218f5c
Merge pull request #12 from TheTimurid/changes/Coordinate-System-Fix-…
TheTimurid Aug 19, 2020
54ffbe8
Vulkan HitTester (#13)
hydra41 Aug 21, 2020
e213172
WIP
TheTimurid Aug 21, 2020
6fcca4f
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Aug 21, 2020
a0670a2
WIP
TheTimurid Aug 24, 2020
6d36df6
WIP
TheTimurid Aug 25, 2020
0552426
WIP
TheTimurid Aug 26, 2020
eaee37a
Merge pull request #14 from TheTimurid/changes/Static-Device-Atlas-Save
TheTimurid Aug 26, 2020
bbc11b4
Changes/hit tester updates (#15)
hydra41 Aug 28, 2020
5c6923d
WIP
TheTimurid Aug 28, 2020
dcbb2b5
Merge remote-tracking branch 'refs/remotes/origin/feature/Migrate-ren…
TheTimurid Aug 28, 2020
b271a9a
Fixed validation error for the offscreen render pass - colour format …
hydra41 Aug 28, 2020
1e5c51c
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Aug 28, 2020
6892366
WIP (#18)
TheTimurid Aug 28, 2020
d086b6c
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Aug 30, 2020
64f586b
WIP
TheTimurid Aug 30, 2020
9320bf2
WIP
TheTimurid Sep 1, 2020
64565a9
Merge pull request #20 from TheTimurid/changes/9-Labels
TheTimurid Sep 3, 2020
bc14ab3
Shader compilation
TheTimurid Sep 4, 2020
18ba446
Indicator line now renders.
TheTimurid Oct 27, 2020
4c31879
Links renderables/CVKAxesRenderable (#21)
TheTimurid Nov 2, 2020
716aa46
Feature/perspective lines renderable (#22)
TheTimurid Nov 10, 2020
d1791d8
FPS now shows actual FPS
TheTimurid Nov 10, 2020
dc5d2c0
JIT rendering and DrawFlags
TheTimurid Nov 10, 2020
f1b9f29
Link labels (#23)
TheTimurid Nov 12, 2020
3fefa93
Loop renderable (#24)
TheTimurid Nov 23, 2020
02d1112
Blaze renderable
TheTimurid Nov 23, 2020
3fe2b80
Fixes
TheTimurid Nov 24, 2020
9b8791a
Fix blazes rendering for all vertices
TheTimurid Nov 24, 2020
3aec445
Merge branch 'feature/LWJGL-Vulkan' of https://github.com/constellati…
TheTimurid Nov 24, 2020
b5895c2
Compilation fixes
TheTimurid Nov 24, 2020
61a9137
Merge branch 'constellation-app-feature/LWJGL-Vulkan'
TheTimurid Nov 24, 2020
93fa23e
Merge branch 'master' into feature/Migrate-renderer-to-Vulkan
TheTimurid Nov 24, 2020
9b752dc
Merge branch 'feature/Migrate-renderer-to-Vulkan' of github.com:TheTi…
TheTimurid Nov 24, 2020
a1e19dd
Changed OpenGL module display name
TheTimurid Nov 24, 2020
a7979cb
Pull lwjgl3-awt from the Third-Party-Dependencies repo
TheTimurid Nov 24, 2020
87aab62
Multiple fixes
TheTimurid Nov 25, 2020
a4f9367
Fixed not using compiled shaders
TheTimurid Nov 25, 2020
4b6ee25
Fixed compilation failure in OpenGL
TheTimurid Nov 25, 2020
21ba752
Merge pull request #898 from TheTimurid/master
TheTimurid Nov 25, 2020
c7addc0
Perf and fixes
TheTimurid Nov 26, 2020
9540fcc
Perf and fixes (#899)
TheTimurid Dec 6, 2020
a58b4a4
Config vars for renderer
TheTimurid Dec 6, 2020
e491261
Merge branch 'feature/LWJGL-Vulkan' into master
TheTimurid Dec 6, 2020
99d962b
Merge pull request #907 from TheTimurid/master
TheTimurid Dec 7, 2020
ed165e0
Added Linux and MacOS shader compiler dependencies
TheTimurid Dec 7, 2020
6978f30
Added Linux and MacOS shader compiler dependencies (#27)
TheTimurid Dec 7, 2020
8958e56
Selection box renderable and some bug fixes
TheTimurid Dec 8, 2020
8a3bb5c
Rationalise resource states and added runtime icon swizzling
TheTimurid Dec 16, 2020
632f922
Feature/lwjgl vulkan (#28)
TheTimurid Dec 16, 2020
9982212
Merge branch 'master' of github.com:TheTimurid/constellation
TheTimurid Dec 16, 2020
68e2526
Merge branch 'feature/LWJGL-Vulkan' into master
TheTimurid Dec 16, 2020
5d0494a
Merge pull request #922 from TheTimurid/master
TheTimurid Dec 16, 2020
e5c8589
[Load times] Icon atlas caching
TheTimurid Dec 22, 2020
b20d5b3
Merge remote-tracking branch 'refs/remotes/origin/master'
TheTimurid Dec 22, 2020
ddf246d
Merge pull request #927 from TheTimurid/master
TheTimurid Dec 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@
*.pyc
makefile
*.DS_Store

*.lck
*/genfiles.properties
.v

build
dist
endorsed
cache
/nbproject/private
/*/nbproject/private
*/.jacocoverage/
jacoco*
ConstellationBootstrap

CoreDependencies/release/modules/ext
CoreDependencies/nbproject/project_old.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
*
* @author cygnus_x-1
*/
@SuppressWarnings("rawtypes")
public abstract class VertexDominanceCalculator<T> {

public static VertexDominanceCalculator getDefault() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class AnalyticConfigurationPane extends VBox {
private final Map<AnalyticQuestionDescription<?>, List<SelectableAnalyticPlugin>> questionToPluginsMap;
private final PluginParameters globalAnalyticParameters = new PluginParameters();

@SuppressWarnings({"unchecked", "rawtypes"})
public AnalyticConfigurationPane() {

// create the parameters needed for all analytic questions
Expand Down Expand Up @@ -358,6 +359,7 @@ protected final AnalyticQuestionDescription<?> getCurrentQuestion() {
*
* @return the answered {@link AnalyticQuestion}.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
protected final AnalyticQuestion<?> answerCurrentQuestion() throws AnalyticException {

// build question
Expand Down Expand Up @@ -507,6 +509,7 @@ private void setPluginsFromSelectedQuestion() {
updateGlobalParameters();
}

@SuppressWarnings({"unchecked", "rawtypes"})
public final void updateSelectablePluginsParameters() {
if (categoryListPane.isExpanded()) {
LOGGER.log(Level.INFO, "Update selectable plugins parameters in analytic config pane.");
Expand Down Expand Up @@ -538,6 +541,7 @@ private static void setSuppressedFlag(final boolean newValue) {
selectionSuppressed = newValue;
}

@SuppressWarnings("rawtypes")
public final class SelectableAnalyticPlugin {

private final CheckBox checkbox;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ protected final AnalyticResult<?> getResult() {
return result;
}

@SuppressWarnings("unchecked")
protected final void displayResults(final AnalyticQuestion<?> question) {
result = question.getResult() == null ? new EmptyResult() : question.getResult();
result.setAnalyticController(analyticController);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,7 @@ private void updateTimeZoneAction(final AttributeData attr) {
dialog.showDialog();
}

@SuppressWarnings("unchecked")
private void editKeysAction(final GraphElementType elementType) {
final List<String> currentKeyAttributes = new ArrayList<>();
final List<String> allAttributes = new ArrayList<>();
Expand All @@ -885,6 +886,7 @@ private void editKeysAction(final GraphElementType elementType) {
}
}

@SuppressWarnings({"unchecked", "rawtypes"})
private EventHandler<MouseEvent> getEditValueHandler(final AttributeData attributeData, final AttributeValueEditorFactory editorFactory, final Object[] values) {
return e -> {
final Object value = values.length == 1 ? values[0] : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ public String getDescription() {
return "Test the various input UIs";
}

@SuppressWarnings("unchecked")
@Override
public PluginParameters createParameters() {
final PluginParameters params = new PluginParameters();
Expand Down
220 changes: 220 additions & 0 deletions CoreDependencies/nbproject/project.properties

Large diffs are not rendered by default.

226 changes: 162 additions & 64 deletions CoreDependencies/nbproject/project.xml

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions CoreDependencies/src/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,39 @@
<!--<dependency org="unfolding" name="unfolding" rev="0.9.6"/>-->
<dependency org="org.assertj" name="assertj-core" rev="3.16.1" />

<!--Light Weight Java Game Library-->
<!-- https://mvnrepository.com/artifact/org.lwjgl/lwjgl -->
<dependency org="org.lwjgl" name="lwjgl" rev="3.2.3">
<artifact name="lwjgl" type="jar" ext="jar"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="javadoc"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="sources"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="natives-linux"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="natives-macos"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="natives-windows-x86"/>
<artifact name="lwjgl" type="jar" ext="jar" e:classifier="natives-windows"/>
</dependency>
<!--LWJGL Vulkan bindings, a very thin Java layer over the native API-->
<!--https://mvnrepository.com/artifact/org.lwjgl/lwjgl-vulkan-->
<dependency org="org.lwjgl" name="lwjgl-vulkan" rev="3.2.3">
<artifact name="lwjgl-vulkan" type="jar" ext="jar"/>
<artifact name="lwjgl-vulkan" type="jar" ext="jar" e:classifier="javadoc"/>
<artifact name="lwjgl-vulkan" type="jar" ext="jar" e:classifier="sources"/>
<artifact name="lwjgl-vulkan" type="jar" ext="jar" e:classifier="natives-macos"/>
</dependency>
<!--Only needed if we want to compile GLSL to SPIR-V (this can be done offline)-->
<!--https://mvnrepository.com/artifact/org.lwjgl/lwjgl-shaderc-->
<dependency org="org.lwjgl" name="lwjgl-shaderc" rev="3.2.3">
<artifact name="lwjgl-shaderc" type="jar" ext="jar"/>
<artifact name="lwjgl-shaderc" type="jar" ext="jar" e:classifier="javadoc"/>
<artifact name="lwjgl-shaderc" type="jar" ext="jar" e:classifier="sources"/>
<artifact name="lwjgl-shaderc" type="jar" ext="jar" e:classifier="natives-windows"/>
<artifact name="lwjgl-shaderc" type="jar" ext="jar" e:classifier="natives-linux"/>
<artifact name="lwjgl-shaderc" type="jar" ext="jar" e:classifier="natives-macos"/>
</dependency>
<!--Needed implicitly by the AWTVKCanvas-->
<!-- https://mvnrepository.com/artifact/org.lwjgl/lwjgl-jawt -->
<dependency org="org.lwjgl" name="lwjgl-jawt" rev="3.2.3"/>

<!-- Exclusions -->
<exclude org="javax.media" module="jai_core"/>
<exclude org="javax.media" module="jai_codec"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ public FindRule getState() {
* @param isNew are these attribute from a new graph?
* @param attributes the new attribute to display.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public void updateAttributes(final boolean isNew, final ArrayList<Attribute> attributes) {
if (!attributes.isEmpty()) {
cmbAttributes.setModel(new AttributeComboBoxModel(attributes));
Expand Down Expand Up @@ -253,6 +254,7 @@ public void updateAttributes(final boolean isNew, final ArrayList<Attribute> att
* @param isNew <code>true</code> to get new operator list,
* <code>false</code> to use existing.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public void updateOperators(final boolean isNew) {
if (cmbAttributes.getSelectedItem() instanceof Attribute) {
final Attribute attr = localState.getAttribute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
*
* @author sirius
*/
@SuppressWarnings("unchecked")
public class ItemsDialog<T> extends ConstellationDialog {

private TableView<ItemsRow<T>> table;
Expand Down
1 change: 1 addition & 0 deletions CoreGraphFramework/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<package>au.gov.asd.tac.constellation.graph.attribute.io</package>
<package>au.gov.asd.tac.constellation.graph.attribute.utilities</package>
<package>au.gov.asd.tac.constellation.graph.construction</package>
<package>au.gov.asd.tac.constellation.graph.hittest</package>
<package>au.gov.asd.tac.constellation.graph.locking</package>
<package>au.gov.asd.tac.constellation.graph.manager</package>
<package>au.gov.asd.tac.constellation.graph.mergers</package>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ public StoreGraph(final String id, final Schema schema, int vertexCapacity, int
MemoryManager.newObject(StoreGraph.class);
}

@SuppressWarnings("deprecation")
@Override
public void finalize() {
MemoryManager.finalizeObject(StoreGraph.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public void setCapacity(final int capacity) {
}
}

@SuppressWarnings("unchecked")
@Override
public String getString(final int id) {
return data[id] != null ? String.valueOf((T) data[id]) : null;
Expand Down Expand Up @@ -142,6 +143,7 @@ public void clear(final int id) {
data[id] = defaultValue;
}

@SuppressWarnings("unchecked")
@Override
public AttributeDescription copy(final GraphReadMethods graph) {
final AbstractObjectAttributeDescription<T> attribute;
Expand All @@ -168,11 +170,13 @@ public boolean equals(final int id1, final int id2) {
return data[id1] == null ? data[id2] == null : data[id1].equals(data[id2]);
}

@SuppressWarnings("unchecked")
@Override
public void save(final int id, final ParameterWriteAccess access) {
access.setObject((T) data[id]);
}

@SuppressWarnings("unchecked")
@Override
public void restore(final int id, final ParameterReadAccess access) {
data[id] = (T) access.getUndoObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package au.gov.asd.tac.constellation.graph.interaction.framework;
package au.gov.asd.tac.constellation.graph.hittest;

import au.gov.asd.tac.constellation.graph.GraphElementType;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package au.gov.asd.tac.constellation.graph.interaction.visual.renderables;
package au.gov.asd.tac.constellation.graph.hittest;

import au.gov.asd.tac.constellation.graph.interaction.framework.HitState;
import java.util.Queue;
import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public DualGraph(final Schema schema, final StoreGraph target, final boolean new
MemoryManager.newObject(DualGraph.class);
}

@SuppressWarnings("deprecation")
@Override
public void finalize() throws Throwable {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,14 @@ public void updateUndo(final UndoGraphEditState state, final int instruction) {
@Override
public void execute(final UndoGraphEditState state, final GraphWriteMethods graph) {
if (VERBOSE) {
System.out.println("setDoubleValueOperation.execute(" + state.getCurrentAttribute() + ", " + state.getCurrentId() + ", " + Double.longBitsToDouble((long) (Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())) + ")");
System.out.println("setDoubleValueOperation.execute(" + state.getCurrentAttribute() + ", " + state.getCurrentId() + ", " + Double.longBitsToDouble((Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())) + ")");
}
graph.setDoubleValue(state.getCurrentAttribute(), state.getCurrentId(), Double.longBitsToDouble((long) (Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())));
graph.setDoubleValue(state.getCurrentAttribute(), state.getCurrentId(), Double.longBitsToDouble((Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())));
}

@Override
public void undo(final UndoGraphEditState state, final GraphWriteMethods graph) {
graph.setDoubleValue(state.getCurrentAttribute(), state.getCurrentId(), Double.longBitsToDouble((long) (Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())));
graph.setDoubleValue(state.getCurrentAttribute(), state.getCurrentId(), Double.longBitsToDouble((Double.doubleToRawLongBits(graph.getDoubleValue(state.getCurrentAttribute(), state.getCurrentId())) ^ state.getCurrentDouble())));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ private GraphNode(final InstanceContent content, final Graph graph, final GraphD
MemoryManager.newObject(GraphNode.class);
}

@SuppressWarnings("deprecation")
@Override
public void finalize() {
MemoryManager.finalizeObject(GraphNode.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public void graphChanged(final GraphChangeEvent event) {
}
}

@SuppressWarnings("deprecation")
@Override
public void finalize() throws Throwable {
try {
Expand Down
9 changes: 9 additions & 0 deletions CoreInteractiveGraph/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,14 @@
<specification-version>1.0.6</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>au.gov.asd.tac.constellation.visual.vulkan</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.javahelp</code-name-base>
<build-prerequisite/>
Expand Down Expand Up @@ -209,6 +217,7 @@
<package>au.gov.asd.tac.constellation.graph.interaction.plugins.clipboard</package>
<package>au.gov.asd.tac.constellation.graph.interaction.plugins.io</package>
<package>au.gov.asd.tac.constellation.graph.interaction.plugins.zoom</package>
<package>au.gov.asd.tac.constellation.graph.interaction.visual</package>
</public-packages>
</data>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public abstract class GraphVisualManagerFactory {
*
* @param graph The graph to be visually managed.
* @return A {@link VisualManager} for the graph.
* @throws java.lang.Throwable
*/
public abstract VisualManager constructVisualManager(final Graph graph);
public abstract VisualManager constructVisualManager(final Graph graph) throws Throwable;

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*/
package au.gov.asd.tac.constellation.graph.interaction.framework;

import au.gov.asd.tac.constellation.graph.interaction.visual.renderables.NewLineModel;
import au.gov.asd.tac.constellation.graph.interaction.visual.renderables.SelectionBoxModel;
import au.gov.asd.tac.constellation.graph.hittest.HitState;
import au.gov.asd.tac.constellation.utilities.visual.NewLineModel;
import au.gov.asd.tac.constellation.utilities.visual.SelectionBoxModel;
import au.gov.asd.tac.constellation.utilities.visual.VisualOperation;
import au.gov.asd.tac.constellation.utilities.visual.VisualProcessor;
import java.util.Queue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import au.gov.asd.tac.constellation.graph.GraphReadMethods;
import au.gov.asd.tac.constellation.utilities.camera.Camera;
import au.gov.asd.tac.constellation.utilities.graphics.Vector2i;
import au.gov.asd.tac.constellation.utilities.graphics.Vector3f;
import java.awt.Point;

Expand Down Expand Up @@ -148,4 +149,5 @@ public interface VisualInteraction {
* @return A float value describing the scale factor
*/
public float getDPIScalingFactor();

}
Loading