Skip to content

Commit fcfb211

Browse files
javiersevillajaviersevilla
committed
version 1.1
1 parent 8540ee3 commit fcfb211

File tree

273 files changed

+3526
-68921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+3526
-68921
lines changed

‎Assets/Editor/ApiManagerEditor.cs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@ public override void OnInspectorGUI()
1111
DrawDefaultInspector();
1212

1313
var apm = (APIManager)target;
14-
if (GUILayout.Button("Test Damask"))
14+
if (GUILayout.Button("Load Dataset 300 "))
1515
{
16-
apm.OnButtonTestClick();
16+
apm.LoadDataset(300);
1717

1818
}
19-
if (GUILayout.Button("Test Spain Textiles"))
19+
if (GUILayout.Button("Load Dataset 3000 "))
2020
{
21-
apm.TestFranceTextiles();
21+
apm.LoadDataset(3000);
2222

2323
}
24-
if (GUILayout.Button("Test Load Textiles from HTML"))
25-
{
26-
apm.TestLoadTextilesFromHTML();
24+
if (GUILayout.Button("Load Dataset 15000"))
25+
{
26+
apm.LoadDataset(15000);
27+
2728
}
28-
if (GUILayout.Button("Test Object Detail"))
29+
if (GUILayout.Button("Load Dataset 30000 "))
2930
{
30-
apm.TestObjectDetail();
31+
apm.LoadDataset(30000);
3132

3233
}
3334
if (GUILayout.Button("Flat Map"))
@@ -40,19 +41,16 @@ public override void OnInspectorGUI()
4041
apm.ToggleLanguage();
4142

4243
}
43-
if (GUILayout.Button("Apply Damask Filter"))
44-
{
45-
SilkMap.instance.map.addFilter("technique", "Damask");
46-
SilkMap.instance.map.applyFilters();
47-
}
48-
if (GUILayout.Button("Remove Damask Filter"))
49-
{
50-
SilkMap.instance.map.removeFilter("technique", "Damask");
51-
SilkMap.instance.map.applyFilters();
44+
45+
if (GUILayout.Button("Load JSON FROM STREAM"))
46+
{
47+
apm.LoadJSONFromStream();
48+
5249
}
5350
if (GUILayout.Button("Take Screenshot"))
5451
{
5552
ScreenCapture.CaptureScreenshot(Application.streamingAssetsPath + "/"+ Time.realtimeSinceStartup + ".png", 4);
5653
}
54+
5755
}
5856
}

‎Assets/Plugins/javascriptExternalCalls.jslib‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@ mergeInto(LibraryManager.library, {
1111
// Dispatch the event
1212
window.dispatchEvent(event);
1313
},
14+
DataLoaded: function () {
15+
OnDataLoaded();
16+
},
17+
WriteToConsole: function (text) {
18+
var para = document.createElement("P");
19+
para.innerText = Pointer_stringify(text);
20+
$( "#evaluationConsole" ).append( para );
21+
},
1422

1523
});

‎Assets/Prefabs/Bobina_Cluster.prefab‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ MeshRenderer:
5454
m_MotionVectors: 1
5555
m_LightProbeUsage: 1
5656
m_ReflectionProbeUsage: 1
57+
m_RayTracingMode: 2
58+
m_RayTraceProcedural: 0
5759
m_RenderingLayerMask: 1
5860
m_RendererPriority: 0
5961
m_Materials:
@@ -65,6 +67,7 @@ MeshRenderer:
6567
m_ProbeAnchor: {fileID: 0}
6668
m_LightProbeVolumeOverride: {fileID: 0}
6769
m_ScaleInLightmap: 1
70+
m_ReceiveGI: 1
6871
m_PreserveUVs: 0
6972
m_IgnoreNormalsForChartDetection: 0
7073
m_ImportantGI: 0
@@ -77,6 +80,7 @@ MeshRenderer:
7780
m_SortingLayerID: 0
7881
m_SortingLayer: 0
7982
m_SortingOrder: 0
83+
m_AdditionalVertexStreams: {fileID: 0}
8084
--- !u!1 &4114279271487086812
8185
GameObject:
8286
m_ObjectHideFlags: 0
@@ -131,6 +135,8 @@ MeshRenderer:
131135
m_MotionVectors: 1
132136
m_LightProbeUsage: 1
133137
m_ReflectionProbeUsage: 1
138+
m_RayTracingMode: 2
139+
m_RayTraceProcedural: 0
134140
m_RenderingLayerMask: 1
135141
m_RendererPriority: 0
136142
m_Materials:
@@ -142,6 +148,7 @@ MeshRenderer:
142148
m_ProbeAnchor: {fileID: 0}
143149
m_LightProbeVolumeOverride: {fileID: 0}
144150
m_ScaleInLightmap: 1
151+
m_ReceiveGI: 1
145152
m_PreserveUVs: 0
146153
m_IgnoreNormalsForChartDetection: 0
147154
m_ImportantGI: 0
@@ -154,6 +161,7 @@ MeshRenderer:
154161
m_SortingLayerID: 0
155162
m_SortingLayer: 0
156163
m_SortingOrder: 0
164+
m_AdditionalVertexStreams: {fileID: 0}
157165
--- !u!1 &4114279271487086814
158166
GameObject:
159167
m_ObjectHideFlags: 0
@@ -198,7 +206,7 @@ CapsuleCollider:
198206
m_GameObject: {fileID: 4114279271487086814}
199207
m_Material: {fileID: 0}
200208
m_IsTrigger: 1
201-
m_Enabled: 1
209+
m_Enabled: 0
202210
m_Radius: 0.5
203211
m_Height: 1
204212
m_Direction: 1
@@ -212,7 +220,7 @@ MonoBehaviour:
212220
m_GameObject: {fileID: 4114279271487086814}
213221
m_Enabled: 1
214222
m_EditorHideFlags: 0
215-
m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
223+
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
216224
m_Name:
217225
m_EditorClassIdentifier:
218226
m_Delegates:
@@ -224,7 +232,6 @@ MonoBehaviour:
224232
callback:
225233
m_PersistentCalls:
226234
m_Calls: []
227-
delegates: []
228235
--- !u!114 &114875851565849216
229236
MonoBehaviour:
230237
m_ObjectHideFlags: 0
@@ -234,15 +241,14 @@ MonoBehaviour:
234241
m_GameObject: {fileID: 4114279271487086814}
235242
m_Enabled: 1
236243
m_EditorHideFlags: 0
237-
m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
244+
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
238245
m_Name:
239246
m_EditorClassIdentifier:
240247
m_Delegates:
241248
- eventID: 2
242249
callback:
243250
m_PersistentCalls:
244251
m_Calls: []
245-
delegates: []
246252
--- !u!114 &114346314870197762
247253
MonoBehaviour:
248254
m_ObjectHideFlags: 0
@@ -252,11 +258,10 @@ MonoBehaviour:
252258
m_GameObject: {fileID: 4114279271487086814}
253259
m_Enabled: 1
254260
m_EditorHideFlags: 0
255-
m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
261+
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
256262
m_Name:
257263
m_EditorClassIdentifier:
258264
m_Delegates: []
259-
delegates: []
260265
--- !u!1 &7726361339448142608
261266
GameObject:
262267
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)