gg.easy.airship 0.1.1662 → 0.1.1663

package/Runtime/Code/VoxelWorld/{SelectionZone.cs → Editor/SelectionZone.cs}

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using System.Windows.Forms;
+using System.Collections.Generic;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -259,7 +259,7 @@ public class SelectionZone : MonoBehaviour
 #if UNITY_EDITOR
  
 [CustomEditor(typeof(SelectionZone))]
-public class SelectionZoneEditor : Editor {
+public class SelectionZoneEditor : UnityEditor.Editor {
     private const float handleSize = 0.3f;
  
     private bool mouseDown = false;
@@ -298,10 +298,21 @@ public class SelectionZoneEditor : Editor {
     //Gui
     public override void OnInspectorGUI() {
         //draw default
-        DrawDefaultInspector();
+        //DrawDefaultInspector();
 
-        //Draw a reset button
+        //Add typeins for size x y and z
         SelectionZone cube = (SelectionZone)target;
+        Vector3Int oldSize = new Vector3Int((int)cube.size.x, (int)cube.size.y, (int)cube.size.z);
+        Vector3Int newSize = EditorGUILayout.Vector3IntField("Size", oldSize);
+        
+        if (newSize != oldSize) {
+            cube.size = newSize;
+            SnapToGrid();
+            cube.BuildCube();
+            ResetHandles();
+        }
+
+        //Draw a reset button
         if (GUILayout.Button("Reset")) {
             handleOffset = new float[6] {
               1,1,1,1,1,1
@@ -313,6 +324,13 @@ public class SelectionZoneEditor : Editor {
             cube.size = new Vector3(1, 1, 1);
             cube.BuildCube();
         }
+        if (cube.voxelWorld == null) {
+            return;
+        }
+        if (cube.voxelWorld.voxelBlocks == null) {
+            return;
+        }
+        VoxelEditManager voxelEditManager = VoxelEditManager.Instance;
 
         //Add Copy Button
         if (GUILayout.Button("Fill")) {
@@ -323,20 +341,23 @@ public class SelectionZoneEditor : Editor {
             float px = cube.transform.localPosition.x;
             float py = cube.transform.localPosition.y;
             float pz = cube.transform.localPosition.z;
-            
-            
+                        
             if (cube.voxelWorld) {
-                
+
+                List<VoxelEditAction.EditInfo> edits = new();
+
+                int selectedIndex = cube.voxelWorld.selectedBlockIndex;
                 //Walk the current selection zone
-                for (int x = (int)(px - dx); x < (int)(px+dx); x++) {
-                    for (int y = (int)(py - dy); y < (int)(py + dy); y++) {
-                        for (int z = (int)(pz - dz); z < (int)(pz + dz); z++) {
-                            cube.voxelWorld.WriteVoxelAt(new Vector3Int(x, y, z), 1, false);
+                for (int x = Mathf.FloorToInt(px - dx); x < Mathf.CeilToInt(px + dx); x++) {
+                    for (int y = Mathf.FloorToInt(py - dy); y < Mathf.CeilToInt(py + dy); y++) {
+                        for (int z = Mathf.FloorToInt(pz - dz); z < Mathf.CeilToInt(pz + dz); z++) {
+                            UInt16 prevData = cube.voxelWorld.ReadVoxelAt(new Vector3Int(x, y, z));
+                            edits.Add(new VoxelEditAction.EditInfo(new Vector3Int(x, y, z), prevData, (UInt16)selectedIndex));
                         }
                     }
                 }
+                voxelEditManager.AddEdits(cube.voxelWorld, edits, "Fill Voxels");
             }
-                
         }
 
         if (GUILayout.Button("Copy")) {
@@ -354,18 +375,17 @@ public class SelectionZoneEditor : Editor {
             copiedData = new UInt16[(int)cube.size.x * (int)cube.size.y * (int)cube.size.z];
 
             if (cube.voxelWorld) {
-
+                
                 int index = 0;
                 //Walk the current selection zone
-                for (int x = (int)(px - dx); x < (int)(px + dx); x++) {
-                    for (int y = (int)(py - dy); y < (int)(py + dy); y++) {
-                        for (int z = (int)(pz - dz); z < (int)(pz + dz); z++) {
+                for (int x = Mathf.FloorToInt(px - dx); x < Mathf.CeilToInt(px + dx); x++) {
+                    for (int y = Mathf.FloorToInt(py - dy); y < Mathf.CeilToInt(py + dy); y++) {
+                        for (int z = Mathf.FloorToInt(pz - dz); z < Mathf.CeilToInt(pz + dz); z++) {
                             copiedData[index++] = cube.voxelWorld.ReadVoxelAt(new Vector3Int(x, y, z)); 
                         }
                     }
                 }
             }
-
         }
 
         if (haveCopiedData == false) {
@@ -380,7 +400,7 @@ public class SelectionZoneEditor : Editor {
         }else {
             //Actual paste
             if (GUILayout.Button("Paste")) {
-                //walk the bounds
+                //walk the bouns
                 float dx = copiedSize.x / 2;
                 float dy = copiedSize.y / 2;
                 float dz = copiedSize.z / 2;
@@ -390,18 +410,27 @@ public class SelectionZoneEditor : Editor {
 
                 if (cube.voxelWorld) {
                     int index = 0;
+
+                    List<VoxelEditAction.EditInfo> edits = new();
+
                     //Walk the current selection zone
-                    for (int x = (int)(px - dx); x < (int)(px + dx); x++) {
-                        for (int y = (int)(py - dy); y < (int)(py + dy); y++) {
-                            for (int z = (int)(pz - dz); z < (int)(pz + dz); z++) {
-                                cube.voxelWorld.WriteVoxelAt(new Vector3Int(x, y, z), copiedData[index++], false);
+                    for (int x = Mathf.FloorToInt(px - dx); x < Mathf.CeilToInt(px + dx); x++) {
+                        for (int y = Mathf.FloorToInt(py - dy); y < Mathf.CeilToInt(py + dy); y++) {
+                            for (int z = Mathf.FloorToInt(pz - dz); z < Mathf.CeilToInt(pz + dz); z++) {
+                                //cube.voxelWorld.WriteVoxelAt(new Vector3Int(x, y, z), copiedData[index++], false);
+                                UInt16 prevData = cube.voxelWorld.ReadVoxelAt(new Vector3Int(x, y, z));
+                                edits.Add(new VoxelEditAction.EditInfo(new Vector3Int(x, y, z), prevData, copiedData[index++]));
                             }
                         }
                     }
+                    voxelEditManager.AddEdits(cube.voxelWorld, edits, "Paste Voxels");
+
+
                 }
 
                 //resize the box to whatever we pasted
                 cube.size = new Vector3(copiedSize.x, copiedSize.y, copiedSize.z);
+                SnapToGrid();
                 cube.BuildCube();
                 ResetHandles();
             }
@@ -480,7 +509,6 @@ public class SelectionZoneEditor : Editor {
         }
         if (Event.current.type == EventType.MouseDown) {
             mouseDown = true;
-           
         }
 
         Transform cubeTransform = cube.transform;
@@ -527,9 +555,7 @@ public class SelectionZoneEditor : Editor {
             if (moved == true) {
                 
                 float distance =  localHandlePos.magnitude - trueHandleOffset[i];
-              
                 float steps = Mathf.Floor(distance);
-                Debug.Log("Steps" + steps);
 
                 handleOffset[i] = localHandlePos.magnitude;
                 

package/Runtime/Code/VoxelWorld/Editor/VoxelBuilderEditorWindow.cs

@@ -120,7 +120,7 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
             
 
             //See if we're in the selection mode
-            if (VoxelWorldSelectionTool.buttonActive == true) {
+            if (VoxelWorldSelectionToolBase.buttonActive == true) {
                 //Find or create the SelectionZone for this voxelWorld
 
                 selection = world.GetComponentInChildren<SelectionZone>();
@@ -134,7 +134,7 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 //Select this
                 Selection.activeGameObject = selection.gameObject;
             }
-            if (VoxelWorldEditorTool.buttonActive == true) {
+            if (VoxelWorldEditorToolBase.buttonActive == true) {
             
                 //If we're not in selection mode, destroy the selection zone
                 selection = world.GetComponentInChildren<SelectionZone>();
@@ -164,13 +164,19 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
 
             GUIStyle selectedStyle = new GUIStyle(GUI.skin.button);
             selectedStyle.normal.textColor = Color.green;
-
+            selectedStyle.hover.textColor = Color.green;
             
             foreach (var pair in world.voxelBlocks.loadedBlocks) {
+
+                string name = pair.Value.definition.name;
+                if (name == "") {
+                    name = "Air";
+                }
+
                 if (pair.Key == world.selectedBlockIndex) {
-                    GUILayout.Button(pair.Value.definition.name, selectedStyle);
+                    GUILayout.Button(name, selectedStyle);
                 } else {
-                    if (GUILayout.Button(pair.Value.definition.name)) {
+                    if (GUILayout.Button(name)) {
                         world.selectedBlockIndex = pair.Key;
                     }
                 }

package/Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs

@@ -7,17 +7,32 @@ using UnityEditor.EditorTools;
 using UnityEngine;
 using System;
 using static UnityEditor.PlayerSettings;
+using static VoxelEditAction;
 
 public class VoxelEditAction {
-    public Vector3Int position;
-    public ushort oldValue;
-    public ushort newValue;
+    
+    public struct EditInfo{
+        public Vector3Int position;
+        public ushort oldValue;
+        public ushort newValue;
+        //constructor
+        public EditInfo(Vector3Int position, ushort oldValue, ushort newValue){
+            this.position = position;
+            this.oldValue = oldValue;
+            this.newValue = newValue;
+        }
+    }
+    public List<EditInfo> edits = new List<EditInfo>();
+
     [NonSerialized]
     public WeakReference<VoxelWorld> world;
-    public void Initialize(VoxelWorld world, Vector3Int position, ushort oldValue, ushort newValue) {
-        this.position = position;
-        this.oldValue = oldValue;
-        this.newValue = newValue;
+    public void CreateSingleEdit(VoxelWorld world, Vector3Int position, ushort oldValue, ushort newValue) {
+        edits.Add(new EditInfo(position, oldValue, newValue));
+        this.world = new(world);
+    }
+
+    public void CreateMultiEdit(VoxelWorld world, List<EditInfo> edits) {
+        this.edits = edits;
         this.world = new(world);
     }
 }
@@ -30,11 +45,10 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
     VoxelEditMarker undoObject;
     public List<VoxelEditAction> edits = new List<VoxelEditAction>();
     public List<VoxelEditAction> redos = new List<VoxelEditAction>();
-
-
+        
     public void AddEdit(VoxelWorld world, Vector3Int position, ushort oldValue, ushort newValue, string name) {
         VoxelEditAction edit = new VoxelEditAction();
-        edit.Initialize(world, position, oldValue, newValue);
+        edit.CreateSingleEdit(world, position, oldValue, newValue);
         edits.Add(edit);
 
         //If we're adding a new edit, clear the redos
@@ -52,9 +66,33 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
         world.DirtyNeighborMeshes(position);
 
         world.hasUnsavedChanges = true; 
- 
     }
 
+    public void AddEdits(VoxelWorld world, List<EditInfo> editInfos, string name) {
+        VoxelEditAction edit = new VoxelEditAction();
+        edit.CreateMultiEdit(world, editInfos);
+        edits.Add(edit);
+
+        //If we're adding a new edit, clear the redos
+        redos.Clear();
+
+        if (undoObject == null) {
+            undoObject = ScriptableObject.CreateInstance<VoxelEditMarker>();
+        }
+        undoObject.lastAction = edit;
+
+        //Save the state of this whole object into the undo system
+        Undo.RegisterCompleteObjectUndo(undoObject, name);
+
+        foreach (EditInfo editInfo in editInfos) {
+            world.WriteVoxelAtInternal(editInfo.position, editInfo.newValue);
+            world.DirtyNeighborMeshes(editInfo.position);
+        }
+        
+        world.hasUnsavedChanges = true;
+    }
+
+
     //Constructor
     public VoxelEditManager() {
         Undo.undoRedoEvent += UndoRedoEvent;
@@ -69,8 +107,10 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
 
                 edit.world.TryGetTarget(out VoxelWorld currentWorld);
                 if (currentWorld){
-                    currentWorld.WriteVoxelAtInternal(edit.position, edit.oldValue);
-                    currentWorld.DirtyNeighborMeshes(edit.position);
+                    foreach (var editInfo in edit.edits) {
+                        currentWorld.WriteVoxelAtInternal(editInfo.position, editInfo.oldValue);
+                        currentWorld.DirtyNeighborMeshes(editInfo.position);
+                    }
                     currentWorld.hasUnsavedChanges = true;
                 }
 
@@ -83,8 +123,10 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
                 redos.RemoveAt(redos.Count - 1);
                 edit.world.TryGetTarget(out VoxelWorld currentWorld);
                 if (currentWorld) {
-                    currentWorld.WriteVoxelAtInternal(edit.position, edit.newValue);
-                    currentWorld.DirtyNeighborMeshes(edit.position);
+                    foreach (var editInfo in edit.edits) {
+                        currentWorld.WriteVoxelAtInternal(editInfo.position, editInfo.newValue);
+                        currentWorld.DirtyNeighborMeshes(editInfo.position);
+                    }
                     currentWorld.hasUnsavedChanges = true;
                 }
 
@@ -380,9 +422,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
             handle.name = "_SelectionHandle";
             handle.hideFlags = HideFlags.HideAndDontSave; 
         }
-
-
-
+        
         if (faceHandle == null) {
             faceHandle = GameObject.CreatePrimitive(PrimitiveType.Quad);
             faceHandle.transform.localScale = new Vector3(1.01f, 1.01f, 1.01f);
@@ -396,13 +436,12 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         if (Event.current.shift) { //Delete
             DestroyImmediate(faceHandle);
             faceHandle = null;
-                
         }
-        
 
         if (handle) {
             handle.transform.position = world.TransformPointToWorldSpace(lastPos + new Vector3(0.5f,0.5f,0.5f));
             handle.transform.localScale = new Vector3(1.01f, 1.01f, 1.01f);
+            handle.transform.localRotation = Quaternion.identity;
 
             WireCube wireCube = handle.GetComponent<WireCube>();
             if (wireCube) {
@@ -422,7 +461,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         
         if (faceHandle) {
             faceHandle.transform.position = world.TransformPointToWorldSpace(lastPos + new Vector3(0.5f, 0.5f, 0.5f) + lastNormal * 0.51f);
-            faceHandle.transform.rotation = Quaternion.LookRotation(lastNormal);
+            faceHandle.transform.rotation = Quaternion.LookRotation(world.TransformVectorToWorldSpace(lastNormal));
 
             MeshRenderer ren = faceHandle.GetComponent<MeshRenderer>();
             if (leftControlDown == true) {
@@ -447,7 +486,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         Event e = Event.current;
 
         //Only allow editing if both the editor window is active and the gizmo toolbar is active
-        bool enabled = VoxelBuilderEditorWindow.Enabled() && VoxelWorldEditorTool.buttonActive;
+        bool enabled = VoxelBuilderEditorWindow.Enabled() && VoxelWorldEditorToolBase.buttonActive;
         
         if (enabled != lastEnabled) {
             CleanupHandles();
@@ -575,13 +614,13 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         SceneView.duringSceneGui -= GizmoRefreshEvent;
     }
 
-    void OnSelectionChanged() {
+    void OnSelectionChanged() { 
         if (target == null) {
             return;
         }
         //If we're seleceted
         if (Selection.activeGameObject == ((VoxelWorld)target).gameObject) {
-            ToolManager.SetActiveTool<VoxelWorldEditorTool>();
+            ToolManager.SetActiveTool<VoxelWorldEditorToolBase>();
         }
 
         
@@ -591,8 +630,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
 
 
 //Create the spiffy toolbar addition
-[EditorTool("Edit Voxel World", typeof(VoxelWorld))]
-public class VoxelWorldEditorTool : EditorTool {
+public class VoxelWorldEditorToolBase : EditorTool {
 
     public static bool buttonActive = false;
 
@@ -619,8 +657,8 @@ public class VoxelWorldEditorTool : EditorTool {
 }
 
 
-[EditorTool("Edit Voxel Selection", typeof(VoxelWorld))]
-public class VoxelWorldSelectionTool : EditorTool {
+
+public class VoxelWorldSelectionToolBase : EditorTool {
 
     public static bool buttonActive = false;
 
@@ -645,4 +683,22 @@ public class VoxelWorldSelectionTool : EditorTool {
         }
     }
 }
+
+[EditorTool("Edit Voxel World", typeof(VoxelWorld))]
+public class VoxelWorldSelectionToolVW : VoxelWorldSelectionToolBase {
+}
+
+[EditorTool("Edit Voxel Selection", typeof(VoxelWorld))]
+public class VoxelWorldEditorToolVW : VoxelWorldEditorToolBase {
+}
+
+//Same again for SelectionZone
+[EditorTool("Edit Voxel World", typeof(SelectionZone))]
+public class VoxelWorldSelectionToolSZ : VoxelWorldSelectionToolBase {
+}
+
+[EditorTool("Edit Voxel Selection", typeof(SelectionZone))]
+public class VoxelWorldEditorToolSZ : VoxelWorldEditorToolBase {
+}
+
 #endif

package/Runtime/Code/VoxelWorld/VoxelWorld.cs

@@ -138,6 +138,11 @@ public partial class VoxelWorld : MonoBehaviour {
         return transform.localToWorldMatrix.MultiplyPoint(point);
     }
 
+    public Vector3 TransformVectorToWorldSpace(Vector3 vec) {
+        return transform.localToWorldMatrix.MultiplyVector(vec);
+    }
+
+
     public void InvokeOnFinishedReplicatingChunksFromServer() {
         this.finishedReplicatingChunksFromServer = true;
         this.OnFinishedReplicatingChunksFromServer?.Invoke();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.1662",
+  "version": "0.1.1663",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",