version 1.1

silknow · May 28, 2021 · fcfb211 · fcfb211
1 parent 8540ee3
commit fcfb211
Show file tree

Hide file tree

Showing 273 changed files with 3,526 additions and 68,921 deletions.
diff --git a/Assets/Editor/ApiManagerEditor.cs b/Assets/Editor/ApiManagerEditor.cs
@@ -11,23 +11,24 @@ public override void OnInspectorGUI()
         DrawDefaultInspector();
 
         var apm = (APIManager)target;
-        if (GUILayout.Button("Test Damask"))
+        if (GUILayout.Button("Load Dataset 300 "))
         {            
-            apm.OnButtonTestClick();
+            apm.LoadDataset(300);
 
         }
-        if (GUILayout.Button("Test Spain Textiles"))
+        if (GUILayout.Button("Load Dataset 3000 "))
         {            
-            apm.TestFranceTextiles();
+            apm.LoadDataset(3000);
 
         }
-        if (GUILayout.Button("Test Load Textiles from HTML"))
-        {
-            apm.TestLoadTextilesFromHTML();
+        if (GUILayout.Button("Load Dataset 15000"))
+        {            
+            apm.LoadDataset(15000);
+
         }
-        if (GUILayout.Button("Test Object Detail"))
+        if (GUILayout.Button("Load Dataset 30000 "))
         {            
-            apm.TestObjectDetail();
+            apm.LoadDataset(30000);
 
         }
         if (GUILayout.Button("Flat Map"))
@@ -40,19 +41,16 @@ public override void OnInspectorGUI()
             apm.ToggleLanguage();
 
         }
-        if (GUILayout.Button("Apply Damask Filter"))
-        {            
-            SilkMap.instance.map.addFilter("technique", "Damask");
-            SilkMap.instance.map.applyFilters();
-        }
-        if (GUILayout.Button("Remove Damask Filter"))
-        {            
-            SilkMap.instance.map.removeFilter("technique", "Damask");
-            SilkMap.instance.map.applyFilters();
+
+        if (GUILayout.Button("Load JSON FROM STREAM"))
+        {
+            apm.LoadJSONFromStream();
+
         }
         if (GUILayout.Button("Take Screenshot"))
         {            
             ScreenCapture.CaptureScreenshot(Application.streamingAssetsPath + "/"+ Time.realtimeSinceStartup + ".png", 4);
         }
+
     }
 }
diff --git a/Assets/Plugins/javascriptExternalCalls.jslib b/Assets/Plugins/javascriptExternalCalls.jslib
@@ -11,5 +11,13 @@ mergeInto(LibraryManager.library, {
         // Dispatch the event
         window.dispatchEvent(event);
         },
+    DataLoaded: function () {
+            OnDataLoaded();
+            },
+     WriteToConsole: function (text) {
+           var para = document.createElement("P");              
+           para.innerText = Pointer_stringify(text);
+           $( "#evaluationConsole" ).append( para );
+           },
 
 });
diff --git a/Assets/Prefabs/Bobina_Cluster.prefab b/Assets/Prefabs/Bobina_Cluster.prefab
@@ -54,6 +54,8 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -65,6 +67,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -77,6 +80,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &4114279271487086812
 GameObject:
   m_ObjectHideFlags: 0
@@ -131,6 +135,8 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -142,6 +148,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -154,6 +161,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &4114279271487086814
 GameObject:
   m_ObjectHideFlags: 0
@@ -198,7 +206,7 @@ CapsuleCollider:
   m_GameObject: {fileID: 4114279271487086814}
   m_Material: {fileID: 0}
   m_IsTrigger: 1
-  m_Enabled: 1
+  m_Enabled: 0
   m_Radius: 0.5
   m_Height: 1
   m_Direction: 1
@@ -212,7 +220,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4114279271487086814}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Delegates:
@@ -224,7 +232,6 @@ MonoBehaviour:
     callback:
       m_PersistentCalls:
         m_Calls: []
-  delegates: []
 --- !u!114 &114875851565849216
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -234,15 +241,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 4114279271487086814}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Delegates:
   - eventID: 2
     callback:
       m_PersistentCalls:
         m_Calls: []
-  delegates: []
 --- !u!114 &114346314870197762
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -252,11 +258,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 4114279271487086814}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Delegates: []
-  delegates: []
 --- !u!1 &7726361339448142608
 GameObject:
   m_ObjectHideFlags: 0