Skip to content
Snippets Groups Projects
Commit 07857c53 authored by VINCENT Nicolas's avatar VINCENT Nicolas
Browse files

Adding missing Assets

parent 2fc95c68
No related branches found
No related tags found
No related merge requests found
......@@ -10,4 +10,17 @@
</activity>
</application>
<uses-permission android:name="com.magicleap.permission.MARKER_TRACKING" />
<uses-permission android:name="com.magicleap.permission.SPACE_MANAGER" />
<uses-permission android:name="com.magicleap.permission.WEBVIEW" />
<uses-permission android:name="com.magicleap.permission.HAND_TRACKING" />
<uses-permission android:name="com.magicleap.permission.SPATIAL_ANCHOR" />
<uses-permission android:name="com.magicleap.permission.SPACE_IMPORT_EXPORT" />
<uses-permission android:name="com.magicleap.permission.EYE_CAMERA" />
<uses-permission android:name="com.magicleap.permission.DEPTH_CAMERA" />
<uses-permission android:name="com.magicleap.permission.SPATIAL_MAPPING" />
<uses-permission android:name="com.magicleap.permission.VOICE_INPUT" />
<uses-permission android:name="com.magicleap.permission.PUPIL_SIZE" />
<uses-permission android:name="com.magicleap.permission.EYE_TRACKING" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
</manifest>
\ No newline at end of file
......@@ -60,4 +60,4 @@ MonoBehaviour:
prefab_dot: {fileID: 4667835204495342566, guid: a1e02c11aeb8e2d4f803ddab2948c607, type: 3}
prefab_line: {fileID: 6936646901775174396, guid: 1f2f042f68c660f42bfdefd0832f4dfb, type: 3}
prefab_map: {fileID: 8184403125478667269, guid: 3b91661360e90f641866d3f333e980fa, type: 3}
RA_type: 3
RA_type: 2
......@@ -91,7 +91,7 @@ Light:
m_Lightmapping: 2
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 5
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
......@@ -190,7 +190,7 @@ Light:
m_Lightmapping: 2
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 5
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
......@@ -400,7 +400,7 @@ Light:
m_Lightmapping: 2
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 5
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
......@@ -801,7 +801,7 @@ Light:
m_Lightmapping: 2
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 5
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
......
......@@ -791,7 +791,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5609791579423962305, guid: fe799b2d0a84dfe43b001b56276fd2fb, type: 3}
propertyPath: near clip plane
value: 0.01
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 5609791579423962305, guid: fe799b2d0a84dfe43b001b56276fd2fb, type: 3}
propertyPath: m_BackGroundColor.a
......
......@@ -55,8 +55,11 @@ public class TCPClient : MonoBehaviour
/*IPHostEntry ipHostInfo = await Dns.GetHostEntryAsync("DESKTOP-JJ0H7CK");
IPAddress ipAddress = ipHostInfo.AddressList[0];
IPEndPoint ip = new(ipAddress, 8080);*/
IPEndPoint ip = new IPEndPoint(IPAddress.Parse("10.29.225.78"), 8080);
IPEndPoint ip = new IPEndPoint(IPAddress.Parse("10.129.37.59"), 8080);
//old : ("10.29.225.78"), 8080);
//ip casque 10.129.37.90:5555
//ip pc 10.129.37.44 : 8080
//10.129.37.115
server = new Socket(AddressFamily.InterNetwork,SocketType.Stream, ProtocolType.Tcp);
//using TcpClient server = new();
......@@ -66,6 +69,9 @@ public class TCPClient : MonoBehaviour
await server.ConnectAsync(ip);
Debug.Log("Connected with "+ IPAddress.Parse(((IPEndPoint)server.RemoteEndPoint).Address.ToString()) +" at port " + ((IPEndPoint)server.RemoteEndPoint).Port.ToString());
//bug: sort l'IP par défaut 0.0.0.0
//Debug.Log("Connected with "+ IPAddress.Parse(((IPEndPoint)server.RemoteEndPoint).IPAddress.ToString()) +" at port " + ((IPEndPoint)server.RemoteEndPoint).Port.ToString());
/****** HERE
client = new System.Net.Sockets.TcpClient("localhost", Int32.Parse(PortNumber));
......
......@@ -15,7 +15,7 @@ public class Action : MonoBehaviour
public GameObject prefab_dot;
public GameObject prefab_line;
public GameObject prefab_map;
public int RA_type; // 1 fleche 2 trait 3 point 4 map 5 cacher
public int RA_type; // 1 trait 2 fleche 3 point 4 map 5 cacher
void Start() {
canva = GameObject.Find("Canva");
......
......@@ -779,7 +779,7 @@ PlayerSettings:
suppressCommonWarnings: 1
allowUnsafeCode: 0
useDeterministicCompilation: 1
selectedPlatform: 0
selectedPlatform: 2
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment