uc-hoba
/
Test-Planet
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Main.unity): remove unused Metamesh data and update values

Browse Source
master
hoba 10 months ago
parent 2fd67b7b29
commit 14c9055028
5 changed files with 23 additions and 174 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      Assets/Main.unity
  2. 2
      Assets/Resources/New GoldbergPolyhedron.gph.meta
  3. 0
      Assets/Resources/New Metamesh.metamesh
  4. 77
      Assets/Resources/New Metamesh.metamesh.meta
  5. 42
      Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs

76
Assets/Main.unity
Unescape View File

@ -119,67 +119,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &76657492
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalPosition.y
value: 3.04
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalPosition.z
value: -2.709
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8980549144392899874, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_Name
value: New Metamesh
objectReference: {fileID: 0}
- target: {fileID: 8980549144392899874, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: -4216948427090074523, guid: f5e4c28eb4672d24ca584d5456a268e7, type: 3}
--- !u!1 &203844586
GameObject:
m_ObjectHideFlags: 0
@ -1045,31 +984,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalRotation.w
value: -0.68892944
value: -0.35572362
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalRotation.x
value: -0.110723004
value: 0.048700657
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5440326
value: 0.93008095
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalRotation.z
value: -0.4659885
value: 0.07770764
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 41.268
value: -10.323
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -59.318
value: -138.326
objectReference: {fileID: 0}
- target: {fileID: -364223573239433514, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 1123.944
value: 1082.057
objectReference: {fileID: 0}
- target: {fileID: 2163061155770630284, guid: 666014e54879dc1479f1c29bea163dd4, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
@ -2426,4 +2365,3 @@ SceneRoots:
- {fileID: 604712594}
- {fileID: 505702790}
- {fileID: 1427021447}
- {fileID: 76657492}

2
Assets/Resources/New GoldbergPolyhedron.gph.meta
Unescape View File

@ -9,7 +9,7 @@ ScriptedImporter:
assetBundleVariant:
script: {fileID: 11500000, guid: 80f1e0e8eacc4a945b07bba9e3065c99, type: 3}
radius: 1
m: 16
m: 14
n: 1
generateLightmapUVs: 0
readWriteMeshes: 0

0
Assets/Resources/New Metamesh.metamesh
Unescape View File

77
Assets/Resources/New Metamesh.metamesh.meta
Unescape View File

@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: f5e4c28eb4672d24ca584d5456a268e7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a8b5f06e412d587cbac1226722904238, type: 3}
_shape: 3
_plane:
Size:
x: 1
y: 1
Subdivisions:
x: 2
y: 2
Axis: 1
DoubleSided: 0
_box:
Width: 1
Height: 1
Depth: 1
_sphere:
Radius: 1
Columns: 24
Rows: 12
Axis: 1
_icosphere:
Radius: 1
Subdivision: 3
_cylinder:
TopRadius: 1
BottomRadius: 1
Height: 1
Columns: 24
Rows: 12
Axis: 1
Caps: 1
_roundedBox:
Width: 1
Height: 1
Depth: 1
Divisions: 3
Radius: 0.1
_ring:
Radius: 1
Width: 0.1
Angle: 1
Segments: 32
Axis: 2
DoubleSided: 0
_disc:
Radius: 1
Angle: 1
Segments: 32
Axis: 2
DoubleSided: 0
_teapot:
Subdivision: 10
_triangle:
Vertex1:
x: 0
y: 0
z: 0
Vertex2:
x: 0
y: 1
z: 0
Vertex3:
x: 1
y: 0
z: 0
DoubleSided: 0
_generateLightmapUVs: 0
_readWriteMeshes: 1

42
Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs
Unescape View File

@ -36,18 +36,18 @@ namespace Metamesh
"Regular",
new Dictionary<int, Vector3>
{
{0,new Vector3(0, PHI, -1)},
{1,new Vector3(-PHI, 1, 0)},
{2,new Vector3(-1, 0, -PHI)},
{3,new Vector3(1, 0, -PHI)},
{4,new Vector3(PHI, 1, 0)},
{5,new Vector3(0, PHI, 1)},
{6,new Vector3(-1, 0, PHI)},
{7,new Vector3(-PHI, -1, 0)},
{8,new Vector3(0, -PHI, -1)},
{9,new Vector3(PHI, -1, 0)},
{10,new Vector3(1, 0, PHI)},
{11,new Vector3(0, -PHI, 1)},
{ 0, new Vector3(0, PHI, -1) },
{ 1, new Vector3(-PHI, 1, 0) },
{ 2, new Vector3(-1, 0, -PHI) },
{ 3, new Vector3(1, 0, -PHI) },
{ 4, new Vector3(PHI, 1, 0) },
{ 5, new Vector3(0, PHI, 1) },
{ 6, new Vector3(-1, 0, PHI) },
{ 7, new Vector3(-PHI, -1, 0) },
{ 8, new Vector3(0, -PHI, -1) },
{ 9, new Vector3(PHI, -1, 0) },
{ 10, new Vector3(1, 0, PHI) },
{ 11, new Vector3(0, -PHI, 1) },
},
new List<List<int>>
{
@ -791,14 +791,7 @@ namespace Metamesh
{
near[item[0]] = nearIndex++;
}
// TODO
/*
this.vertex = this.vertex
.Select((v, i) => (Vertex: v, SortKey: near[i]))
.OrderBy(x => x.SortKey)
.Select(x => x.Vertex)
.ToList();
*/
var values = this.vertex.Values
.Select((v, i) => (Vertex: v, SortKey: near[i]))
.OrderBy(x => x.SortKey)
@ -859,15 +852,10 @@ namespace Metamesh
public PolyhedronData ToGoldbergPolyhedronData()
{
var goldbergPolyhedronData =
new PolyhedronData("GeoDual", "Goldberg", new Dictionary<int, Vector3>(), new List<List<int>>());
var goldbergPolyhedronData = new PolyhedronData("GeoDual", "Goldberg", new(), new());
goldbergPolyhedronData.name = "GD dual";
var verticesNb = this.vertex.Count;
var map = new List<int>[verticesNb];
for (var v = 0; v < verticesNb; v++)
{
map[v] = new List<int>();
}
var map = Enumerable.Range(0, verticesNb).Select(_ => new List<int>()).ToArray();
for (var f = 0; f < this.face.Count; f++)
{