Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 34eee1ed authored by Fabien Grzeskowiak's avatar Fabien Grzeskowiak
Browse files

fix qolo

parent 0937c85c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 12 deletions
Assets/AddOns/friction.physicMaterial
+ 2
− 2
View file @ 34eee1ed
......@@ -7,8 +7,8 @@ PhysicMaterial:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: friction
dynamicFriction: 0.1
dynamicFriction: 1
staticFriction: 2
bounciness: 0
frictionCombine: 1
frictionCombine: 3
bounceCombine: 0
Assets/DiffDriveController.cs
+ 1
− 1
View file @ 34eee1ed
......@@ -103,7 +103,7 @@ public class DiffDriveController : MonoBehaviour
}
private void Accelerate(float left, float right)
public void Accelerate(float left, float right)
{
rightMotorWriter.Write(right);
leftMotorWriter.Write(left);
......
Assets/MainAssets/Scripts/Agents/ControlSim/Simulations.cs
+ 4
− 3
View file @ 34eee1ed
......@@ -180,8 +180,9 @@ public class SimManager {
public void doStep(float deltaTime, List<Vector3> posList, Agent playerGoalState, List<Agent> agentsGoalState, List<Robot> robots = null)
{
int i = 0;
int in_sim_id = 0;
bool player_in_sim = true;
int in_sim_id = 0;
bool player_in_sim = false;
// Update simulators state
foreach (ControlSim sim in simulators)
......@@ -192,11 +193,11 @@ public class SimManager {
if(((TrialCamPlayer)LoaderConfig.playerInfo).in_sim)
{
sim.updateAgentState(i, posList[i], (playerGoalState.Position- posList[i])/deltaTime);
player_in_sim = true;
}
else
{
i = -1;
player_in_sim = false;
}
}
else
......
Assets/MotorWriter.cs
+ 1
− 1
View file @ 34eee1ed
......@@ -25,7 +25,7 @@ namespace RosSharp.RosBridgeClient
wheel.GetWorldPose(out _pos, out _quat);
transform.position = _pos;
transform.position = _pos;
transform.rotation = _quat;
}
......
Assets/Robots/RobotsModels/3d models/Narko2/Narko2.prefab
+ 24
− 0
View file @ 34eee1ed
......@@ -54,6 +54,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -132,6 +133,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -210,6 +212,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -342,6 +345,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -420,6 +424,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -498,6 +503,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -576,6 +582,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -654,6 +661,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -732,6 +740,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -810,6 +819,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -888,6 +898,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -966,6 +977,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1044,6 +1056,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1122,6 +1135,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1200,6 +1214,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1278,6 +1293,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1356,6 +1372,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1434,6 +1451,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1512,6 +1530,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1590,6 +1609,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1668,6 +1688,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1746,6 +1767,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1824,6 +1846,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -1902,6 +1925,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/head_with_neck.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/left_arm.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -54,6 +54,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/left_hand.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -54,6 +54,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/left_shoulder.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -54,6 +54,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/leg.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/lower_body.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/pepper.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/pepper_with_wheels.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/right_arm.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/right_hand.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -54,6 +54,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/right_shoulder.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/upper_body.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/Old/Pepper-3Ddata-master/wheels.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/urdf/meshes/base.prefab
+ 1
− 0
View file @ 34eee1ed
......@@ -85,6 +85,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......
Assets/Robots/RobotsModels/3d models/Old/Pepper/urdf/meshes/base_0.asset
+ 5
− 5
View file @ 34eee1ed
source diff could not be displayed: it is too large. Options to address this: view the blob.
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