Minor attempts at fixes, fix some camera issues, but there is still a…

… bug on the res loader

craft3data/src/com/hiveworkshop/ReteraCASCUtils.java

@@ -1,6 +1,7 @@
 package com.hiveworkshop;
 
 public class ReteraCASCUtils {
+	public static final boolean LOAD_OLD_131_FORMAT = false;
 
 	public static boolean arraysEquals(final byte[] a, final int aFromIndex, final int aToIndex, final byte[] b,
 			final int bFromIndex, final int bToIndex) {
@@ -14,7 +15,7 @@ public static boolean arraysEquals(final byte[] a, final int aFromIndex, final i
 		if (b == null) {
 			return false;
 		}
-		if ((aToIndex - aFromIndex) != (bToIndex - bFromIndex)) {
+		if (aToIndex - aFromIndex != bToIndex - bFromIndex) {
 			return false;
 		}
 		int j = bFromIndex;
@@ -29,10 +30,10 @@ public static boolean arraysEquals(final byte[] a, final int aFromIndex, final i
 	public static int arraysCompareUnsigned(final byte[] a, final int aFromIndex, final int aToIndex, final byte[] b,
 			final int bFromIndex, final int bToIndex) {
 		final int i = arraysMismatch(a, aFromIndex, aToIndex, b, bFromIndex, bToIndex);
-		if ((i >= 0) && (i < Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex))) {
+		if (i >= 0 && i < Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex)) {
 			return byteCompareUnsigned(a[aFromIndex + i], b[bFromIndex + i]);
 		}
-		return (aToIndex - aFromIndex) - (bToIndex - bFromIndex);
+		return aToIndex - aFromIndex - (bToIndex - bFromIndex);
 	}
 
 	private static int byteCompareUnsigned(final byte b, final byte c) {
@@ -43,7 +44,7 @@ private static int arraysMismatch(final byte[] a, final int aFromIndex, final in
 			final int bFromIndex, final int bToIndex) {
 		final int aLength = aToIndex - aFromIndex;
 		final int bLength = bToIndex - bFromIndex;
-		for (int i = 0; (i < aLength) && (i < bLength); i++) {
+		for (int i = 0; i < aLength && i < bLength; i++) {
 			if (a[aFromIndex + i] != b[bFromIndex + i]) {
 				return i;
 			}

craft3data/src/com/hiveworkshop/blizzard/casc/vfs/TVFSDecoder.java

@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.hiveworkshop.ReteraCASCUtils;
 import com.hiveworkshop.blizzard.casc.Key;
 import com.hiveworkshop.blizzard.casc.nio.MalformedCASCStructureException;
 
@@ -155,7 +156,9 @@ private StorageReference[] getFileReferences(final int fileOffset) throws Malfor
 					storageBuffer.get(encodingKeyDecoder);
 
 					final int physicalSize = storageBuffer.getInt();
-					storageBuffer.get();
+					if (!ReteraCASCUtils.LOAD_OLD_131_FORMAT) {
+						storageBuffer.get();
+					}
 					final int actualSize = storageBuffer.getInt();
 
 					final StorageReference reference = new StorageReference(offset, size, new Key(encodingKeyDecoder),
@@ -177,7 +180,7 @@ public TVFSFile loadFile(final ByteBuffer fileBuffer) throws IOException {
 
 		// check identifier
 
-		if ((localBuffer.remaining() < IDENTIFIER.remaining())
+		if (localBuffer.remaining() < IDENTIFIER.remaining()
 				|| !localBuffer.limit(IDENTIFIER.remaining()).equals(IDENTIFIER)) {
 			throw new MalformedCASCStructureException("missing TVFS identifier");
 		}
@@ -204,20 +207,20 @@ public TVFSFile loadFile(final ByteBuffer fileBuffer) throws IOException {
 
 			pathOffset = localBuffer.getInt();
 			pathSize = localBuffer.getInt();
-			if ((Integer.toUnsignedLong(pathOffset) + Integer.toUnsignedLong(pathSize)) > localBuffer.capacity()) {
+			if (Integer.toUnsignedLong(pathOffset) + Integer.toUnsignedLong(pathSize) > localBuffer.capacity()) {
 				throw new MalformedCASCStructureException("path stream extends past end of file");
 			}
 
 			fileReferenceOffset = localBuffer.getInt();
 			fileReferenceSize = localBuffer.getInt();
-			if ((Integer.toUnsignedLong(fileReferenceOffset) + Integer.toUnsignedLong(fileReferenceSize)) > localBuffer
+			if (Integer.toUnsignedLong(fileReferenceOffset) + Integer.toUnsignedLong(fileReferenceSize) > localBuffer
 					.capacity()) {
 				throw new MalformedCASCStructureException("logical data extends past end of file");
 			}
 
 			cascReferenceOffset = localBuffer.getInt();
 			cascReferenceSize = localBuffer.getInt();
-			if ((Integer.toUnsignedLong(cascReferenceOffset) + Integer.toUnsignedLong(cascReferenceSize)) > localBuffer
+			if (Integer.toUnsignedLong(cascReferenceOffset) + Integer.toUnsignedLong(cascReferenceSize) > localBuffer
 					.capacity()) {
 				throw new MalformedCASCStructureException("storage data extends past end of file");
 			}
@@ -227,7 +230,7 @@ public TVFSFile loadFile(final ByteBuffer fileBuffer) throws IOException {
 			throw new MalformedCASCStructureException("header goes out of bounds");
 		}
 
-		contentsOffsetSize = Math.max(1, Integer.BYTES - (Integer.numberOfLeadingZeros(cascReferenceSize) / Byte.SIZE));
+		contentsOffsetSize = Math.max(1, Integer.BYTES - Integer.numberOfLeadingZeros(cascReferenceSize) / Byte.SIZE);
 		contentsOffsetDecoder.putInt(0, 0);
 
 		localBuffer.limit(pathOffset + pathSize);

craft3data/src/com/hiveworkshop/wc3/gui/modeledit/MaterialListRenderer.java

@@ -3,6 +3,7 @@
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.Image;
+import java.awt.image.BufferedImage;
 import java.util.HashMap;
 
 import javax.swing.DefaultListCellRenderer;
@@ -27,9 +28,11 @@ public Component getListCellRendererComponent(final JList list, final Object val
 		final String name = ((Material) value).getName();
 		ImageIcon myIcon = map.get(value);
 		if (myIcon == null) {
-			myIcon = new ImageIcon(((Material) value).getBufferedImage(model.getWrappedDataSource())
-					.getScaledInstance(64, 64, Image.SCALE_SMOOTH));
-			map.put((Material) value, myIcon);
+			final BufferedImage bufferedImage = ((Material) value).getBufferedImage(model.getWrappedDataSource());
+			if (bufferedImage != null) {
+				myIcon = new ImageIcon(bufferedImage.getScaledInstance(64, 64, Image.SCALE_SMOOTH));
+				map.put((Material) value, myIcon);
+			}
 		}
 		super.getListCellRendererComponent(list, name, index, iss, chf);
 		setIcon(myIcon);

craft3data/src/com/hiveworkshop/wc3/gui/modeledit/ModelPanel.java

@@ -111,9 +111,9 @@ public ModelPanel(final JComponent parent, final EditableModel input, final Prog
 		modelView = new ModelViewManager(input);
 		undoManager = new UndoManagerImpl(undoHandler);
 		editorRenderModel = new RenderModel(input, modelView);
-		editorRenderModel.setSpawnParticles((prefs.getRenderParticles() == null) || prefs.getRenderParticles());
+		editorRenderModel.setSpawnParticles(prefs.getRenderParticles() == null || prefs.getRenderParticles());
 		editorRenderModel.setAllowInanimateParticles(
-				(prefs.getRenderStaticPoseParticles() == null) || prefs.getRenderStaticPoseParticles());
+				prefs.getRenderStaticPoseParticles() == null || prefs.getRenderStaticPoseParticles());
 		modelEditorManager = new ModelEditorManager(modelView, prefs, modeNotifier, modelEditorChangeNotifier,
 				viewportActivityManager, editorRenderModel, modelStructureChangeListener);
 		modelViewManagingTree = new ModelViewManagingTree(modelView, undoManager, modelEditorManager);
@@ -153,7 +153,8 @@ public void typeChanged(final SelectionItemTypes newType) {
 		animationController = new AnimationController(modelView, true, animationViewer,
 				animationViewer.getCurrentAnimation());
 
-		cameraController = new CameraManagerPanel(modelView, animationViewer);
+		cameraController = new CameraManagerPanel(modelView, animationViewer, modelStructureChangeListener,
+				modelEditorManager.getModelEditor(), undoManager);
 
 		frontArea.setControlsVisible(prefs.showVMControls());
 		botArea.setControlsVisible(prefs.showVMControls());
@@ -419,8 +420,7 @@ public boolean close(final ModelPanelCloseListener listener)// MainPanel parent)
 				canceled = true;
 				break;
 			}
-		}
-		else // parent.tabbedPane.remove(myIndex);
+		} else // parent.tabbedPane.remove(myIndex);
 		if (editUVPanel != null) {
 			editUVPanel.view.setVisible(false);
 		}
@@ -515,13 +515,11 @@ public void viewMatrices() {
 		}
 		String boneList = "";
 		for (int i = 0; i < boneRefs.size(); i++) {
-			if (i == (boneRefs.size() - 2)) {
+			if (i == boneRefs.size() - 2) {
 				boneList = boneList + boneRefs.get(i).getName() + " and ";
-			}
-			else if (i == (boneRefs.size() - 1)) {
+			} else if (i == boneRefs.size() - 1) {
 				boneList = boneList + boneRefs.get(i).getName();
-			}
-			else {
+			} else {
 				boneList = boneList + boneRefs.get(i).getName() + ", ";
 			}
 		}

craft3data/src/com/hiveworkshop/wc3/gui/modeledit/creator/actions/DrawCameraAction.java

@@ -0,0 +1,43 @@
+package com.hiveworkshop.wc3.gui.modeledit.creator.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hiveworkshop.wc3.gui.modeledit.UndoAction;
+import com.hiveworkshop.wc3.gui.modeledit.actions.newsys.ModelStructureChangeListener;
+import com.hiveworkshop.wc3.mdl.Camera;
+import com.hiveworkshop.wc3.mdl.v2.ModelView;
+
+public class DrawCameraAction implements UndoAction {
+	private final ModelView modelView;
+	private final Camera camera;
+	private final ModelStructureChangeListener modelStructureChangeListener;
+	private final List<Camera> cameraAsList;
+
+	public DrawCameraAction(final ModelView modelView, final ModelStructureChangeListener modelStructureChangeListener,
+			final Camera camera) {
+		this.modelView = modelView;
+		this.camera = camera;
+		this.modelStructureChangeListener = modelStructureChangeListener;
+		cameraAsList = new ArrayList<>();
+		cameraAsList.add(camera);
+	}
+
+	@Override
+	public void undo() {
+		modelView.getModel().remove(camera);
+		modelStructureChangeListener.camerasRemoved(cameraAsList);
+	}
+
+	@Override
+	public void redo() {
+		modelView.getModel().add(camera);
+		modelStructureChangeListener.camerasAdded(cameraAsList);
+	}
+
+	@Override
+	public String actionName() {
+		return "add " + camera.getName();
+	}
+
+}