Commit e2d608dd authored by juliette bonnard's avatar juliette bonnard
Browse files

Reset du slider de la tomo + freeze de la momie

parent a2427eab
......@@ -12095,6 +12095,10 @@ MonoBehaviour:
Obj: {fileID: 21776209033387991}
- UFIdstring: c701b3bd-fe83-4aef-9af8-0b7ad10fc631
Obj: {fileID: 20800098266110581}
- UFIdstring: 88ea23dd-7718-4e55-81c7-c66301bd0925
Obj: {fileID: 2137676140}
- UFIdstring: e63d12b3-ed1c-4dd9-aaf1-af167a8f2822
Obj: {fileID: 124313393}
assetsReferences: {fileID: 0}
--- !u!114 &1008082595
MonoBehaviour:
......
......@@ -67,5 +67,22 @@ public class tomoScript : MonoBehaviour
color.a = map(value, minEnv, maxEnv, 1, 0);
enveloppeMaterial.color = color;
}
public void resetSliderValue()
{
sliderValue = 0;
Color color = peloteMaterial.color;
color.a = map(0, minPelote, maxPelote, 1, 0);
peloteMaterial.color = color;
color = bonesMaterial.color;
color.a = map(0, minOs, maxOs, 0, 1);
bonesMaterial.color = color;
color = enveloppeMaterial.color;
color.a = map(0, minEnv, maxEnv, 1, 0);
enveloppeMaterial.color = color;
}
}
......@@ -102,4 +102,10 @@ public class MoveObj : MonoBehaviour
gameObject.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.None;
}
// Empêche la translation en X, la rotation en Y et la rotation en Z de l'objet (Utilisé avant de placer la momie dans le scanner et l'appareil radio)
public void freeze()
{
gameObject.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezeRotationY | RigidbodyConstraints.FreezeRotationZ;
}
}
......@@ -10,7 +10,7 @@
<sequence xsi:type="Place" id="Place_0" label="Place_0">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.714407444" y="-499.2143" />
<position x="299.714417" y="-599.2143" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -45,7 +45,7 @@
<sequence xsi:type="Place" id="Place_14_-1" label="">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="700.054565" y="700.99585" />
<position x="700.054565" y="899.99585" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -280,6 +280,20 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_20" label="Place_20">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.271257877" y="-499.806519" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_22" label="Place_22">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="699.832" y="700.289246" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<transition id="Transition_1" label="Deplace Leap">
<extendedInfo>
<sevenEditorExtension xmlns="">
......@@ -329,7 +343,7 @@
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_0" />
<upstreamSequence idref="Place_20" />
<downstreamSequence idref="Place_4_-1" />
</transition>
<transition id="Transition_4" label="Texte saisie">
......@@ -543,7 +557,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_3" label="Affiche radio">
<effectorUpdate classname="SetActiveMany, Assembly-CSharp">
<effectorUpdate classname="SetActiveMany, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="" type="System.Collections.Generic.ICollection`1[[UnityEngine.GameObject, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],mscorlib" name="gameObjects">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="elem0">
<param value="88fcd3b5-8c56-4814-8142-70f3cbee23b1" type="System.Guid,mscorlib" name="UFID" />
......@@ -568,7 +582,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_9" label="Commentaire résultat 1">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="La radiographie permet d'observer l'intérieur d'une momie sans avoir à l'ouvrir et à l'endommager. C'est donc bien mieux que de réaliser une fouille manuelle." type="System.String,mscorlib" name="Text" />
<param value="False" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -585,8 +599,8 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_10" label="Commentaire retour">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp" />
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<sensorCheck classname="NoVoicelineSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Pour revenir au menu principal et choisir une nouvelle séquence, appuyez sur le bouton &quot;Fin&quot; à droite de l'écran." type="System.String,mscorlib" name="Text" />
<param value="True" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="False" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -602,7 +616,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_11" label="Affiche bouton fin">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="ece2cea0-08dc-466f-b7cb-eda86be6de11" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -619,7 +633,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_0_1_1_1" label="Clic bouton">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp">
<sensorCheck classname="CheckValueSensor, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Bouton,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MemberInfo,mscorlib" name="member">
<param value="Bouton,Assembly-CSharp" name="DeclaringType" />
......@@ -641,7 +655,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_3_1_1" label="Affiche radio">
<effectorUpdate classname="SetActiveMany, Assembly-CSharp">
<effectorUpdate classname="SetActiveMany, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="" type="System.Collections.Generic.ICollection`1[[UnityEngine.GameObject, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]],mscorlib" name="gameObjects">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="elem0">
<param value="ece2cea0-08dc-466f-b7cb-eda86be6de11" type="System.Guid,mscorlib" name="UFID" />
......@@ -666,7 +680,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_14" label="Affiche tablette">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp">
<effectorUpdate classname="SetActiveEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="6bdb677e-04c0-4df5-9312-fb60b3920061" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -683,7 +697,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_15" label="Commentaire résultat 2">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp">
<effectorUpdate classname="PlayVoicelineEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Cependant, tous les os sont superposés sur l'image et certains détails sont difficiles à observer. La radiographie n'est donc pas la technique la plus adaptée." type="System.String,mscorlib" name="Text" />
<param value="False" type="System.Boolean,mscorlib" name="Stays on screen" />
<param value="True" type="System.Boolean,mscorlib" name="Wait For End" />
......@@ -828,7 +842,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_19" label="Replace momie">
<effectorUpdate classname="MoveObjectAbsolute, Assembly-CSharp">
<effectorUpdate classname="MoveObjectAbsolute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param type="UnityEngine.GameObject,UnityEngine.CoreModule" name="gameObject">
<param value="24b727fa-f25f-4b20-9abe-1594c4a50ede" type="System.Guid,mscorlib" name="UFID" />
</param>
......@@ -864,7 +878,7 @@
</effectorUpdate>
</event>
<upstreamSequence idref="Place_16" />
<downstreamSequence idref="Place_14_-1" />
<downstreamSequence idref="Place_22" />
</transition>
<transition id="Transition_21" label="clignote">
<extendedInfo>
......@@ -1157,6 +1171,39 @@
<upstreamSequence idref="Place_32" />
<downstreamSequence idref="Place_13" />
</transition>
<transition id="Transition_5" label="transition">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="0.8426864" y="-600.0922" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5" label="transition" />
<upstreamSequence idref="Place_0" />
<downstreamSequence idref="Place_20" />
</transition>
<transition id="Transition_5_5" label="empêche translation x, rot y et rot z momie">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="699.832" y="806.289246" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5_5_1" label="empêche translation x, rot y et rot z momie">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
<param value="freeze" type="System.String,mscorlib" name="MethodName" />
<param type="System.Type[],mscorlib" name="Types" />
</param>
<param value="" type="SEVEN.FIVE.MethodParameters,FIVE.Unity" name="parameters" />
<param type="UnityEngine.MonoBehaviour,UnityEngine.CoreModule" name="Calling Object">
<param value="c3acd6cb-a992-4680-a90f-74bd37bcffe9" type="System.Guid,mscorlib" name="UFID" />
</param>
</effectorUpdate>
</event>
<upstreamSequence idref="Place_22" />
<downstreamSequence idref="Place_14_-1" />
</transition>
<initialSequence idref="Place_0" />
<finalSequence idref="Place_14_-1" />
</sequence>
......
......@@ -18,7 +18,7 @@
<sequence xsi:type="Place" id="Place_0" label="Debut Tomo">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-100" y="-1100" />
<position x="200" y="-1200" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -102,7 +102,7 @@
<sequence xsi:type="Place" id="Place_21" label="Fin Tomo">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="799.7494" y="900.846436" />
<position x="899.7494" y="1099.84644" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -340,7 +340,7 @@
<sequence xsi:type="Place" id="Place_6" label="Place_6">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="400.519257" y="-500.0781" />
<position x="500.5193" y="-499.078125" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -375,7 +375,7 @@
<sequence xsi:type="Place" id="Place_50" label="Place_50">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="400.9303" y="899.875732" />
<position x="300.9303" y="899.875732" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
......@@ -386,6 +386,27 @@
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_49" label="Place_49">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="500.982239" y="900.663147" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_52" label="Place_52">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-99.82428" y="-1100.37268" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<sequence xsi:type="Place" id="Place_53" label="Place_53">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="700.977" y="899.5544" />
</sevenEditorExtension>
</extendedInfo>
</sequence>
<transition id="Transition_1" label="Deplace Leap">
<extendedInfo>
<sevenEditorExtension xmlns="">
......@@ -436,7 +457,7 @@
<param value="4" type="System.Single,mscorlib" name="Length" />
</effectorUpdate>
</event>
<upstreamSequence idref="Place_0" />
<upstreamSequence idref="Place_52" />
<downstreamSequence idref="Place_4" />
</transition>
<transition id="Transition_4" label="Texte saisie">
......@@ -1274,7 +1295,7 @@
</extendedInfo>
<event id="Transition_32_4_1" label="rot y">
<sensorCheck classname="SEVEN.Time.TimeSensor, SEVEN.Extra, Version=4.5.1.0, Culture=neutral, PublicKeyToken=null">
<param value="2" type="System.Double,mscorlib" name="minimum" />
<param value="2.5" type="System.Double,mscorlib" name="minimum" />
<param value="SECOND" type="SEVEN.Time.TimeUnit,SEVEN.Extra" name="unit" />
</sensorCheck>
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
......@@ -1366,7 +1387,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33_1_1" label="rot y">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -1424,7 +1445,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33_4_1" label="rot y">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -1482,7 +1503,7 @@
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_5" label="rot x">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="TourneCamera,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
......@@ -1631,15 +1652,32 @@
<upstreamSequence idref="Place_41" />
<downstreamSequence idref="Place_50" />
</transition>
<transition id="Transition_33" label="Transition_33">
<transition id="Transition_33" label="reset position slider">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="499.9303" y="900.625732" />
<position x="399.9303" y="900.625732" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_33" label="Transition_33" />
<event id="Transition_33" label="reset position slider">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<param value="Leap.Unity.Interaction.InteractionSlider,Assembly-CSharp-firstpass" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="Leap.Unity.Interaction.InteractionSlider,Assembly-CSharp-firstpass" type="System.Type,mscorlib" name="DeclaringType" />
<param value="set_HorizontalSliderPercent" type="System.String,mscorlib" name="MethodName" />
<param type="System.Type[],mscorlib" name="Types">
<param value="System.Single,mscorlib" type="System.RuntimeType,mscorlib" name="elem0" />
</param>
</param>
<param value="" type="SEVEN.FIVE.MethodParameters,FIVE.Unity" name="parameters">
<param value="0" type="System.Single,mscorlib" name="elem0" />
</param>
<param type="UnityEngine.MonoBehaviour,UnityEngine.CoreModule" name="Calling Object">
<param value="88ea23dd-7718-4e55-81c7-c66301bd0925" type="System.Guid,mscorlib" name="UFID" />
</param>
</effectorUpdate>
</event>
<upstreamSequence idref="Place_50" />
<downstreamSequence idref="Place_21" />
<downstreamSequence idref="Place_49" />
</transition>
<transition id="Transition_9_1" label="Replace scanner">
<extendedInfo>
......@@ -1675,6 +1713,62 @@
<upstreamSequence idref="Place_23" />
<downstreamSequence idref="Place_51" />
</transition>
<transition id="Transition_25" label="reset valeur slider">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="600.982239" y="900.091736" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_25" label="reset valeur slider">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="tomoScript,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="tomoScript,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
<param value="resetSliderValue" type="System.String,mscorlib" name="MethodName" />
<param type="System.Type[],mscorlib" name="Types" />
</param>
<param value="" type="SEVEN.FIVE.MethodParameters,FIVE.Unity" name="parameters" />
<param type="UnityEngine.MonoBehaviour,UnityEngine.CoreModule" name="Calling Object">
<param value="e63d12b3-ed1c-4dd9-aaf1-af167a8f2822" type="System.Guid,mscorlib" name="UFID" />
</param>
</effectorUpdate>
</event>
<upstreamSequence idref="Place_49" />
<downstreamSequence idref="Place_53" />
</transition>
<transition id="Transition_34" label="transition">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="-99.68141" y="-1200.94409" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_34" label="transition" />
<upstreamSequence idref="Place_0" />
<downstreamSequence idref="Place_52" />
</transition>
<transition id="Transition_34_1" label="empêche translation x, rot y et rot z momie">
<extendedInfo>
<sevenEditorExtension xmlns="">
<position x="899.477" y="899.554443" />
</sevenEditorExtension>
</extendedInfo>
<event id="Transition_34_1_1" label="empêche translation x, rot y et rot z momie">
<effectorUpdate classname="SEVEN.Unity.InvokeUnityObjectMethodEffector, Assembly-CSharp">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="type" />
<param type="System.Reflection.MethodInfo,mscorlib" name="method">
<param value="MoveObj,Assembly-CSharp" type="System.Type,mscorlib" name="DeclaringType" />
<param value="freeze" type="System.String,mscorlib" name="MethodName" />
<param type="System.Type[],mscorlib" name="Types" />
</param>
<param value="" type="SEVEN.FIVE.MethodParameters,FIVE.Unity" name="parameters" />
<param type="UnityEngine.MonoBehaviour,UnityEngine.CoreModule" name="Calling Object">
<param value="6d770385-30bb-40e6-91c0-688733c214cf" type="System.Guid,mscorlib" name="UFID" />
</param>
</effectorUpdate>
</event>
<upstreamSequence idref="Place_53" />
<downstreamSequence idref="Place_21" />
</transition>
<initialSequence idref="Place_0" />
<finalSequence idref="Place_21" />
</sequence>
......
......@@ -19,7 +19,7 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.3"
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.com"
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment