Skip to content

Commit 75e9f47

Browse files
MatveyKMatveyK
committed
Some refactors
1 parent 6c03f30 commit 75e9f47

File tree

4 files changed

+100
-13
lines changed

4 files changed

+100
-13
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ sysinfo.txt
3838

3939
# Mac Annoyingness
4040
.DS_Store
41+
42+
# Remove the Mono compilation log
43+
*.log

‎Assets/Scripts/3DWFC/DiscreteModel.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public class DiscreteModel
2020
{Coord3D.Right, Coord3D.Left, Coord3D.Up, Coord3D.Down, Coord3D.Forward, Coord3D.Back};
2121

2222
//Save these fields in case of reintialisation
23-
private Vector3 outputSize;
24-
private GridCell[,,] inputMatrix;
23+
private readonly Vector3 outputSize;
24+
private readonly GridCell[,,] inputMatrix;
2525

26-
private static readonly Random rnd = new Random();
26+
private static readonly Random Rnd = new Random();
2727

2828

2929
public DiscreteModel(GridCell[,,] inputMatrix, Vector3 outputSize) {
@@ -113,8 +113,8 @@ private static void MergeCells(GridCell[,,] inputMatrix) {
113113
}
114114
}
115115

116-
var test = inputMatrix.Cast<GridCell>().ToList();
117-
Debug.Log($"DISTINCT CELLS: {test.DistinctBy(x => x.Id).ToList().Count}");
116+
var gridCellList = inputMatrix.Cast<GridCell>().ToList();
117+
Debug.Log($"DISTINCT CELLS: {gridCellList.DistinctBy(x => x.Id).ToList().Count}");
118118
}
119119

120120
private static bool CompareCells(GridCell firstCell, GridCell secondCell) {
@@ -151,11 +151,11 @@ public void Observe() {
151151
var collapsableNodes = GetCollapsableNodes();
152152

153153
//Pick a random node from the collapsible nodes.
154-
var nodeCoords = collapsableNodes[rnd.Next(collapsableNodes.Count)];
154+
var nodeCoords = collapsableNodes[Rnd.Next(collapsableNodes.Count)];
155155
var node = outputMatrix[nodeCoords.x, nodeCoords.y, nodeCoords.z];
156156

157157
//Collapse it to a random definite state.
158-
outputMatrix.SetValue(new List<int>() { node[rnd.Next(node.Count)] }, nodeCoords.x, nodeCoords.y, nodeCoords.z);
158+
outputMatrix.SetValue(new List<int>() { node[Rnd.Next(node.Count)] }, nodeCoords.x, nodeCoords.y, nodeCoords.z);
159159

160160
Propagate(nodeCoords.x, nodeCoords.y, nodeCoords.z);
161161

‎Assets/unity-voxel/Assets/Packages/Voxelizer/Scenes/Demo.unity

-1.68 KB
Binary file not shown.

‎CSharp60Support/compilation.log

+90-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
********************************************************************************
2-
* Wednesday, 03 May 2017 23:59:33 *
2+
* Thursday, 04 May 2017 11:40:48 *
33
********************************************************************************
44
CSharpCompilerWrapper.exe version: 2.0.3.30
55
Platform: Mac
@@ -12,15 +12,99 @@ Compiler: Mono C# 6.0
1212
- Compilation -----------------------------------------------
1313

1414
Process: /usr/local/bin/mono
15-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Xml.dll" @Temp/UnityTempFile-bb35e00b02a1248c29acd34064f7adad
15+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Xml.dll" @Temp/UnityTempFile-95afdd6052f1e460aa9a2c50fab2655c
1616
Exit code: 0
17-
Elapsed time: 1.61 sec
17+
Elapsed time: 1.41 sec
1818

1919
- Compiler output (0 lines):
2020

2121
- Compiler errors (0 lines):
2222
********************************************************************************
23-
* Wednesday, 03 May 2017 23:59:36 *
23+
* Thursday, 04 May 2017 11:40:50 *
24+
********************************************************************************
25+
CSharpCompilerWrapper.exe version: 2.0.3.30
26+
Platform: Mac
27+
Target assembly: Assembly-CSharp-Editor-firstpass.dll
28+
Project directory: /Users/madv/Documents/3DSynthesis
29+
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
30+
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
31+
Compiler: Mono C# 6.0
32+
33+
- Compilation -----------------------------------------------
34+
35+
Process: /usr/local/bin/mono
36+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll" @Temp/UnityTempFile-f49b09b17707f456286f0f22b827a50a
37+
Exit code: 0
38+
Elapsed time: 1.09 sec
39+
40+
- Compiler output (0 lines):
41+
42+
- Compiler errors (0 lines):
43+
********************************************************************************
44+
* Thursday, 04 May 2017 11:40:55 *
45+
********************************************************************************
46+
CSharpCompilerWrapper.exe version: 2.0.3.30
47+
Platform: Mac
48+
Target assembly: Assembly-CSharp-Editor.dll
49+
Project directory: /Users/madv/Documents/3DSynthesis
50+
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
51+
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
52+
Compiler: Mono C# 6.0
53+
54+
- Compilation -----------------------------------------------
55+
56+
Process: /usr/local/bin/mono
57+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll" @Temp/UnityTempFile-f8001fd0f6e2c41cdb196ef9a54356fe
58+
Exit code: 0
59+
Elapsed time: 0.62 sec
60+
61+
- Compiler output (0 lines):
62+
63+
- Compiler errors (0 lines):
64+
********************************************************************************
65+
* Thursday, 04 May 2017 11:41:38 *
66+
********************************************************************************
67+
CSharpCompilerWrapper.exe version: 2.0.3.30
68+
Platform: Mac
69+
Target assembly: Assembly-CSharp.dll
70+
Project directory: /Users/madv/Documents/3DSynthesis
71+
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity
72+
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
73+
Compiler: Mono C# 6.0
74+
75+
- Compilation -----------------------------------------------
76+
77+
Process: /usr/local/bin/mono
78+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity/System.Xml.dll" @Temp/UnityTempFile-da426047882264b4da899322a84a1b19
79+
Exit code: 0
80+
Elapsed time: 1.00 sec
81+
82+
- Compiler output (0 lines):
83+
84+
- Compiler errors (0 lines):
85+
********************************************************************************
86+
* Thursday, 04 May 2017 11:41:38 *
87+
********************************************************************************
88+
CSharpCompilerWrapper.exe version: 2.0.3.30
89+
Platform: Mac
90+
Target assembly: Assembly-CSharp-Editor-firstpass.dll
91+
Project directory: /Users/madv/Documents/3DSynthesis
92+
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
93+
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
94+
Compiler: Mono C# 6.0
95+
96+
- Compilation -----------------------------------------------
97+
98+
Process: /usr/local/bin/mono
99+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll" @Temp/UnityTempFile-f89c945a829a74f7592ad972496a32c6
100+
Exit code: 0
101+
Elapsed time: 0.90 sec
102+
103+
- Compiler output (0 lines):
104+
105+
- Compiler errors (0 lines):
106+
********************************************************************************
107+
* Thursday, 04 May 2017 11:41:40 *
24108
********************************************************************************
25109
CSharpCompilerWrapper.exe version: 2.0.3.30
26110
Platform: Mac
@@ -33,9 +117,9 @@ Compiler: Mono C# 6.0
33117
- Compilation -----------------------------------------------
34118

35119
Process: /usr/local/bin/mono
36-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll" @Temp/UnityTempFile-3814ec94188db41ba880825eb6a82a01
120+
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/mcs.exe" -nostdlib+ -noconfig -nologo -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll" -r:"/Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll" @Temp/UnityTempFile-84967553083104fb6a1926624c7d472e
37121
Exit code: 0
38-
Elapsed time: 0.78 sec
122+
Elapsed time: 0.60 sec
39123

40124
- Compiler output (0 lines):
41125

0 commit comments

Comments
 (0)