Merge branch 'master' of github.com:/Retera/ReterasModelStudio

Retera · Dec 6, 2022 · 30aa0ee · 30aa0ee
2 parents a1c3bd1 + a2f2f71
commit 30aa0ee
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/craft3data/src/com/hiveworkshop/wc3/mdl/Bone.java b/craft3data/src/com/hiveworkshop/wc3/mdl/Bone.java
@@ -205,8 +205,8 @@ public void clearAnimation(final Animation a) {
 	}
 
 	/**
-	 * Returns true if this bone contains some type of data that moves, scales, rotates, or otherwise changes based on
-	 * the time track.
+	 * Returns true if this bone contains some type of data that moves, scales,
+	 * rotates, or otherwise changes based on the time track.
 	 *
 	 * @return
 	 */
@@ -357,8 +357,15 @@ public double getClickRadius(final CoordinateSystem coordinateSystem) {
 
 	@Override
 	public float getRenderVisibility(final AnimatedRenderEnvironment animatedRenderEnvironment) {
-		if (geosetAnim != null) {
-			return geosetAnim.getRenderVisibility(animatedRenderEnvironment);
+		if (!multiGeoId) {
+			if (geoset != null) {
+				if (geoset.getGeosetAnim() != null) {
+					return geoset.getGeosetAnim().getRenderVisibility(animatedRenderEnvironment);
+				}
+				if (geosetAnim != null) {
+					return geosetAnim.getRenderVisibility(animatedRenderEnvironment);
+				}
+			}
 		}
 		return 1;
 	}

diff --git a/craft3data/src/com/hiveworkshop/wc3/mdl/EditableModel.java b/craft3data/src/com/hiveworkshop/wc3/mdl/EditableModel.java
@@ -3295,7 +3295,7 @@ class BakingInfo {
 			for (final GeosetVertex vertex : geo.getVertices()) {
 				vertex.un900Heuristic();
 			}
-			if (geo.getLevelOfDetail() != targetLevelOfDetail) {
+			if (geo.getLevelOfDetail() != targetLevelOfDetail && geo.getLevelOfDetail() != -1) {
 				// wrong lod
 				wrongLOD.add(geo);
 			}

diff --git a/craft3data/src/com/hiveworkshop/wc3/mdl/Material.java b/craft3data/src/com/hiveworkshop/wc3/mdl/Material.java
@@ -518,7 +518,7 @@ public VertexData(final Vector3f tangentLightPos, final Vector3f tangentViewPos,
 			final Map<Vertex, VertexData> vertexToData = new HashMap<>();
 			final Vector3f temp = new Vector3f();
 			for (final Geoset geo : model.getGeosets()) {
-				if (geo.getLevelOfDetail() != lod) {
+				if (geo.getLevelOfDetail() != lod && geo.getLevelOfDetail() != -1) {
 					continue;
 				}
 				if (geo.getMaterial() == this || geo.getMaterial().equals(this) || geo.getMaterial().getLayers().get(0)
@@ -567,7 +567,7 @@ public VertexData(final Vector3f tangentLightPos, final Vector3f tangentViewPos,
 				}
 			}
 			for (final Geoset geo : model.getGeosets()) {
-				if (geo.getLevelOfDetail() != lod) {
+				if (geo.getLevelOfDetail() != lod && geo.getLevelOfDetail() != -1) {
 					continue;
 				}
 				if (geo.getMaterial() == this || geo.getMaterial().equals(this) || geo.getMaterial().getLayers().get(0)

diff --git a/craft3data/src/com/hiveworkshop/wc3/units/objectdata/MutableObjectData.java b/craft3data/src/com/hiveworkshop/wc3/units/objectdata/MutableObjectData.java
@@ -856,7 +856,7 @@ public static String getEditorMetaDataDisplayKey(int level, final GameObject met
 			if (upgradeExtensionLevel > 0) {
 				metaDataName += Integer.toString(upgradeExtensionLevel);
 			}
-		} else if (repeats && index == -1) {
+		} else if (repeats && (index == -1 || repeatCount >= 10)) {
 			if (level == 0) {
 				level = 1;
 			}

diff --git a/matrixeater/src/com/matrixeater/src/MainFrame.java b/matrixeater/src/com/matrixeater/src/MainFrame.java
@@ -315,7 +315,7 @@ public void run() {
 						}
 
 						JPopupMenu.setDefaultLightWeightPopupEnabled(false);
-						frame = new MainFrame("Retera Model Studio v0.04.4c");
+						frame = new MainFrame("Retera Model Studio v0.04.4d");
 						panel.init();
 						if (!startupModelPaths.isEmpty()) {
 							for (final String path : startupModelPaths) {

diff --git a/matrixeater/src/com/matrixeater/src/MainPanel.java b/matrixeater/src/com/matrixeater/src/MainPanel.java
@@ -369,6 +369,21 @@ public void actionPerformed(final ActionEvent e) {
 		}
 	};
 	AbstractAction deleteAction = new AbstractAction("Delete") {
+		@Override
+		public void actionPerformed(final ActionEvent e) {
+			final ModelPanel mpanel = currentModelPanel();
+			if (mpanel != null) {
+				if (animationModeState) {
+					timeSliderPanel.deleteSelectedKeyframes();
+				} else {
+					mpanel.getUndoManager()
+							.pushAction(mpanel.getModelEditorManager().getModelEditor().deleteSelectedComponents());
+				}
+			}
+			repaintSelfAndChildren(mpanel);
+		}
+	};
+	AbstractAction deleteHotkeyAction = new AbstractAction("Delete") {
 		@Override
 		public void actionPerformed(final ActionEvent e) {
 			final ModelPanel mpanel = currentModelPanel();
@@ -2137,7 +2152,7 @@ private void linkActions(final JComponent root) {
 		root.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("control Y"),
 				"Redo");
 
-		root.getActionMap().put("Delete", deleteAction);
+		root.getActionMap().put("Delete", deleteHotkeyAction);
 		root.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("DELETE"), "Delete");
 
 		root.getActionMap().put("CloneSelection", cloneAction);