Skip to content

Commit 1cf4254

Browse files
committed
[Full API][scenes] Fix multiple scenes and remove some logs (#65)
* [scenes] backup changes for release * [src] Fix ObjectController position from SOFA and fix demo cube carving scenes * [Scenes] Fix Endoscopy scenes * [src] Remove unnecessary logs
1 parent d202cc9 commit 1cf4254

16 files changed

Lines changed: 38445 additions & 31790 deletions

Plugins/SofaUnityAPI/SofaContextAPI.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ void CopyAssetToPersistent()
3737
Utility_SharpZipCommands.ExtractTGZ (Application.streamingAssetsPath + "/" + "Data.tgz",Application.persistentDataPath);
3838
#endif
3939
#if UNITY_ANDROID && !UNITY_EDITOR
40+
// Prepare Data
41+
Debug.Log("data:" + Application.dataPath);
42+
Debug.Log("persistent:" + Application.persistentDataPath);
43+
Debug.Log("streaming:" + Application.streamingAssetsPath);
44+
4045
//if stub file Resources.data doesn't exist, extract default data...
4146
if (File.Exists(sofaUnityResourcesPath + "/" + "Resources.data") == false)
4247
{
@@ -73,11 +78,6 @@ public SofaContextAPI(bool async)
7378
return;
7479
}
7580

76-
// Prepare Data
77-
Debug.Log("data:" + Application.dataPath);
78-
Debug.Log("persistent:" + Application.persistentDataPath);
79-
Debug.Log("streaming:" + Application.streamingAssetsPath);
80-
8181
CopyAssetToPersistent();
8282

8383
// load the sofaIni file

Resources/Materials/Eye.mat

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Eye
1011
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION _NORMALMAP _PARALLAXMAP
12+
m_ValidKeywords:
13+
- _EMISSION
14+
- _PARALLAXMAP
15+
m_InvalidKeywords: []
1216
m_LightmapFlags: 1
1317
m_EnableInstancingVariants: 0
1418
m_DoubleSidedGI: 0
@@ -54,6 +58,7 @@ Material:
5458
m_Texture: {fileID: 2800000, guid: 7e846634914314f44accdb319a3a9cde, type: 3}
5559
m_Scale: {x: 1, y: 1}
5660
m_Offset: {x: 0, y: 0}
61+
m_Ints: []
5762
m_Floats:
5863
- _BumpScale: -7.23
5964
- _Cutoff: 0.5
@@ -74,3 +79,4 @@ Material:
7479
m_Colors:
7580
- _Color: {r: 1, g: 1, b: 1, a: 1}
7681
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
m_BuildTextureStacks: []

0 commit comments

Comments
 (0)