Skip to content

Commit 6c03f30

Browse files
MatveyKMatveyK
committed
Prepare for demo
1 parent 12bed8d commit 6c03f30

File tree

7 files changed

+20
-195
lines changed

7 files changed

+20
-195
lines changed

‎Assets/Output/CathedralOutput.prefab

16.5 MB
Binary file not shown.

‎Assets/Output/CathedralOutput.prefab.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scripts/3DWFC/DiscreteModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private static void MergeCells(GridCell[,,] inputMatrix) {
114114
}
115115

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

120120
private static bool CompareCells(GridCell firstCell, GridCell secondCell) {

‎Assets/Scripts/3DWFC/Grid.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using UnityEngine;
54

65
public class Grid : MonoBehaviour {
@@ -25,6 +24,7 @@ public void Init(GameObject model, float gridCellSize) {
2524

2625
//Get the model size (represented as a vector in 3D) using its mesh collider
2726
var modelSize = FindMaxVectorPos(model);
27+
Debug.Log(modelSize);
2828

2929
//Init the data matrix
3030
InitGridMatrix(modelSize, gridCellSize);
@@ -119,14 +119,13 @@ private void Optimise3DModel() {
119119
}
120120
}
121121

122-
private List<List<MeshFilter>> OrganiseMeshes(MeshFilter[] meshFilters) {
122+
private static List<List<MeshFilter>> OrganiseMeshes(MeshFilter[] meshFilters) {
123123
var res = new List<List<MeshFilter>>();
124124
var verticesSoFar = 0;
125125

126126
var index = 0;
127127
res.Add(new List<MeshFilter>());
128128
var currList = res[index];
129-
var insideIndex = 0;
130129
for (var i = 0; i < meshFilters.Length; i++) {
131130
if (verticesSoFar + meshFilters[i].mesh.vertexCount > vertexLimit) {
132131
index++;

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

1.2 KB
Binary file not shown.

‎Assets/unity-voxel/Assets/Packages/Voxelizer/Scripts/Demo.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class Demo : MonoBehaviour {
1515
private GameObject gridObj;
1616
private DiscreteModel model;
1717

18+
[SerializeField] private float gridCellSize = 5f;
1819
[SerializeField] Vector3 outputSize = new Vector3(6, 6, 6);
1920

2021
private void Start () {
@@ -41,7 +42,7 @@ private void Start () {
4142
var gridPrefab = Resources.Load("Prefabs/Grid");
4243
gridObj = Instantiate(gridPrefab, Vector3.zero, Quaternion.identity) as GameObject;
4344
grid = gridObj.GetComponent<Grid>();
44-
grid.Init(this.gameObject, 5f);
45+
grid.Init(this.gameObject, gridCellSize);
4546
}
4647

4748

‎CSharp60Support/compilation.log

+6-190
Original file line numberDiff line numberDiff line change
@@ -1,210 +1,26 @@
11
********************************************************************************
2-
* Tuesday, 02 May 2017 12:43:42 *
2+
* Wednesday, 03 May 2017 23:59:33 *
33
********************************************************************************
44
CSharpCompilerWrapper.exe version: 2.0.3.30
55
Platform: Mac
66
Target assembly: Assembly-CSharp.dll
77
Project directory: /Users/madv/Documents/3DSynthesis
88
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity
99
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
10-
Compiler: Microsoft C# 6.0
11-
12-
- Compilation -----------------------------------------------
13-
14-
Process: /usr/local/bin/mono
15-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/Roslyn/csc.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-64acfb652ecc84cebb0933dd1a24908c -debug-
16-
Exit code: 0
17-
Elapsed time: 3.46 sec
18-
19-
- Compiler output (0 lines):
20-
21-
- Compiler errors (1 line):
22-
0: Assets/Scripts/3DWFC/Grid.cs(129,13): warning CS0219: The variable 'insideIndex' is assigned but its value is never used
23-
24-
PDB to MDB conversion skipped
25-
********************************************************************************
26-
* Tuesday, 02 May 2017 12:43:46 *
27-
********************************************************************************
28-
CSharpCompilerWrapper.exe version: 2.0.3.30
29-
Platform: Mac
30-
Target assembly: Assembly-CSharp-Editor.dll
31-
Project directory: /Users/madv/Documents/3DSynthesis
32-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
33-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
34-
Compiler: Microsoft C# 6.0
35-
36-
- Compilation -----------------------------------------------
37-
38-
Process: /usr/local/bin/mono
39-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/Roslyn/csc.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-d9b530cebea1f4d2e85f5f98154a8a9e -debug-
40-
Exit code: 0
41-
Elapsed time: 1.72 sec
42-
43-
- Compiler output (0 lines):
44-
45-
- Compiler errors (0 lines):
46-
47-
PDB to MDB conversion skipped
48-
********************************************************************************
49-
* Tuesday, 02 May 2017 12:44:13 *
50-
********************************************************************************
51-
CSharpCompilerWrapper.exe version: 2.0.3.30
52-
Platform: Mac
53-
Target assembly: Assembly-CSharp.dll
54-
Project directory: /Users/madv/Documents/3DSynthesis
55-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity
56-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
57-
Compiler: Microsoft C# 6.0
58-
59-
- Compilation -----------------------------------------------
60-
61-
Process: /usr/local/bin/mono
62-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/Roslyn/csc.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-0b71be5b09ac94594a9572c372e0cdcc -debug-
63-
Exit code: 0
64-
Elapsed time: 3.26 sec
65-
66-
- Compiler output (0 lines):
67-
68-
- Compiler errors (1 line):
69-
0: Assets/Scripts/3DWFC/Grid.cs(129,13): warning CS0219: The variable 'insideIndex' is assigned but its value is never used
70-
71-
PDB to MDB conversion skipped
72-
********************************************************************************
73-
* Tuesday, 02 May 2017 12:44:13 *
74-
********************************************************************************
75-
CSharpCompilerWrapper.exe version: 2.0.3.30
76-
Platform: Mac
77-
Target assembly: Assembly-CSharp-Editor-firstpass.dll
78-
Project directory: /Users/madv/Documents/3DSynthesis
79-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
80-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
81-
Compiler: Microsoft C# 6.0
82-
83-
- Compilation -----------------------------------------------
84-
85-
Process: /usr/local/bin/mono
86-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/Roslyn/csc.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-f891b7377cc2d4124ba9e796c60fa1ad -debug-
87-
Exit code: 0
88-
Elapsed time: 2.25 sec
89-
90-
- Compiler output (0 lines):
91-
92-
- Compiler errors (0 lines):
93-
94-
PDB to MDB conversion skipped
95-
********************************************************************************
96-
* Tuesday, 02 May 2017 12:44:18 *
97-
********************************************************************************
98-
CSharpCompilerWrapper.exe version: 2.0.3.30
99-
Platform: Mac
100-
Target assembly: Assembly-CSharp-Editor.dll
101-
Project directory: /Users/madv/Documents/3DSynthesis
102-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
103-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
104-
Compiler: Microsoft C# 6.0
105-
106-
- Compilation -----------------------------------------------
107-
108-
Process: /usr/local/bin/mono
109-
Arguments: "/Users/madv/Documents/3DSynthesis/CSharp60Support/Roslyn/csc.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-2d06e18d07341415b9bef7a473252cef -debug-
110-
Exit code: 0
111-
Elapsed time: 1.75 sec
112-
113-
- Compiler output (0 lines):
114-
115-
- Compiler errors (0 lines):
116-
117-
PDB to MDB conversion skipped
118-
********************************************************************************
119-
* Tuesday, 02 May 2017 12:48:27 *
120-
********************************************************************************
121-
CSharpCompilerWrapper.exe version: 2.0.3.30
122-
Platform: Mac
123-
Target assembly: Assembly-CSharp-Editor-firstpass.dll
124-
Project directory: /Users/madv/Documents/3DSynthesis
125-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
126-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
127-
Compiler: Mono C# 6.0
128-
129-
- Compilation -----------------------------------------------
130-
131-
Process: /usr/local/bin/mono
132-
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-61967ace7be074399955d8859f583b02
133-
Exit code: 0
134-
Elapsed time: 1.53 sec
135-
136-
- Compiler output (0 lines):
137-
138-
- Compiler errors (0 lines):
139-
********************************************************************************
140-
* Tuesday, 02 May 2017 12:48:27 *
141-
********************************************************************************
142-
CSharpCompilerWrapper.exe version: 2.0.3.30
143-
Platform: Mac
144-
Target assembly: Assembly-CSharp.dll
145-
Project directory: /Users/madv/Documents/3DSynthesis
146-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity
147-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
148-
Compiler: Mono C# 6.0
149-
150-
- Compilation -----------------------------------------------
151-
152-
Process: /usr/local/bin/mono
153-
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-a66668b88c0574ed6a3b3f5c9e9d9bb5
154-
Exit code: 0
155-
Elapsed time: 1.48 sec
156-
157-
- Compiler output (1 line):
158-
0: Compilation succeeded - 1 warning(s)
159-
160-
- Compiler errors (1 line):
161-
0: Assets/Scripts/3DWFC/Grid.cs(129,13): warning CS0219: The variable `insideIndex' is assigned but its value is never used
162-
********************************************************************************
163-
* Tuesday, 02 May 2017 12:48:29 *
164-
********************************************************************************
165-
CSharpCompilerWrapper.exe version: 2.0.3.30
166-
Platform: Mac
167-
Target assembly: Assembly-CSharp-Editor.dll
168-
Project directory: /Users/madv/Documents/3DSynthesis
169-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/MonoBleedingEdge/lib/mono/2.0-api
170-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
17110
Compiler: Mono C# 6.0
17211

17312
- Compilation -----------------------------------------------
17413

17514
Process: /usr/local/bin/mono
176-
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-4418504a722f046b689254ac30b9e140
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
17716
Exit code: 0
178-
Elapsed time: 0.61 sec
17+
Elapsed time: 1.61 sec
17918

18019
- Compiler output (0 lines):
18120

18221
- Compiler errors (0 lines):
18322
********************************************************************************
184-
* Tuesday, 02 May 2017 12:51:52 *
185-
********************************************************************************
186-
CSharpCompilerWrapper.exe version: 2.0.3.30
187-
Platform: Mac
188-
Target assembly: Assembly-CSharp.dll
189-
Project directory: /Users/madv/Documents/3DSynthesis
190-
Target profile directory: /Applications/Unity5.6/Unity.app/Contents/Mono/lib/mono/unity
191-
Unity 'Data' or 'Frameworks' directory: /Applications/Unity5.6/Unity.app/Contents
192-
Compiler: Mono C# 6.0
193-
194-
- Compilation -----------------------------------------------
195-
196-
Process: /usr/local/bin/mono
197-
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-e7bc5129ac14848a2825c52580fbe4e7
198-
Exit code: 0
199-
Elapsed time: 1.38 sec
200-
201-
- Compiler output (1 line):
202-
0: Compilation succeeded - 1 warning(s)
203-
204-
- Compiler errors (1 line):
205-
0: Assets/Scripts/3DWFC/Grid.cs(129,13): warning CS0219: The variable `insideIndex' is assigned but its value is never used
206-
********************************************************************************
207-
* Tuesday, 02 May 2017 12:51:54 *
23+
* Wednesday, 03 May 2017 23:59:36 *
20824
********************************************************************************
20925
CSharpCompilerWrapper.exe version: 2.0.3.30
21026
Platform: Mac
@@ -217,9 +33,9 @@ Compiler: Mono C# 6.0
21733
- Compilation -----------------------------------------------
21834

21935
Process: /usr/local/bin/mono
220-
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-25e340b2521af42ad940b0ce8576c368
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
22137
Exit code: 0
222-
Elapsed time: 0.74 sec
38+
Elapsed time: 0.78 sec
22339

22440
- Compiler output (0 lines):
22541

0 commit comments

Comments
 (0)