Skip to content
Snippets Groups Projects
Commit 3598df89 authored by Agustin MARINSALDA PASTOR's avatar Agustin MARINSALDA PASTOR
Browse files

feat: asd

parent 7df30ab4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 316 additions and 31 deletions
Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
+ 1
− 1
View file @ 3598df89
......@@ -17,7 +17,7 @@ MonoBehaviour:
AppIdFusion:
AppIdChat:
AppIdVoice:
AppVersion: 1.37
AppVersion: 199664
UseNameServer: 1
FixedRegion:
Server:
......
Assets/Resources/Boat/Boat.cs
+ 12
− 6
View file @ 3598df89
......@@ -14,10 +14,10 @@ namespace RVC
private float leftImpulse = 0.0f;
private float rightImpulse = 0.0f;
private const float THRESHOLD = 1.0f;
private const float THRESHOLD = 0.000001f;
private const float THRUST_MODIFIER = 1.0f;
private const float ROTATION_MODIFIER = 1.0f;
private const float DRAG = 1.0f;
private const float DRAG = 0.95f;
// Start is called before the first frame update
void Start()
......@@ -28,20 +28,19 @@ namespace RVC
// Update is called once per frame
void Update()
{
// if (photonView.IsMine || ! PhotonNetwork.IsConnected) {
computeDrag();
computeMovement();
// }
}
private void computeDrag()
{
leftImpulse = leftImpulse * DRAG;
rightImpulse = rightImpulse * DRAG;
// if (leftImpulse < THRESHOLD) {
// if (leftImpulse <= THRESHOLD) {
// leftImpulse = 0.0f;
// }
// if (rightImpulse < THRESHOLD) {
// if (rightImpulse <= THRESHOLD) {
// rightImpulse = 0.0f;
// }
}
......@@ -51,6 +50,13 @@ namespace RVC
float thrust = (leftImpulse + rightImpulse) * Time.deltaTime * THRUST_MODIFIER;
float deviation = (leftImpulse - rightImpulse) * Time.deltaTime * ROTATION_MODIFIER;
// transform.Translate(-thrust, 0, 0);
// transform.Rotate(0, deviation, 0);
applyMovement(thrust, deviation);
}
public void applyMovement(float thrust, float deviation) {
transform.Translate(-thrust, 0, 0);
transform.Rotate(0, deviation, 0);
}
......
Assets/Resources/Boat/Boat.prefab
+ 4
− 4
View file @ 3598df89
......@@ -77,7 +77,7 @@ GameObject:
- component: {fileID: 8671046100987262016}
- component: {fileID: 6778426530632891050}
- component: {fileID: 5156392463193016013}
- component: {fileID: 3385594040703896376}
- component: {fileID: 3602055528326585661}
m_Layer: 0
m_Name: Boat
m_TagString: Untagged
......@@ -163,7 +163,7 @@ MonoBehaviour:
m_SynchronizeRotation: 1
m_SynchronizeScale: 0
m_UseLocal: 1
--- !u!114 &3385594040703896376
--- !u!114 &3602055528326585661
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -178,9 +178,9 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
Synchronization: 3
Synchronization: 2
OwnershipTransfer: 0
observableSearch: 2
observableSearch: 1
ObservedComponents:
- {fileID: 5156392463193016013}
sceneViewId: 0
......
Assets/Resources/Boat/Paddle/Paddle.cs
+ 8
− 10
View file @ 3598df89
......@@ -40,34 +40,32 @@ namespace RVC
void OnTriggerStay(Collider other)
{
if (other.name != "Water") return;
applyImpulse(computeImpulse());
localApplyImpulse(computeImpulse());
}
float computeImpulse()
{
// float distance = Vector3.Distance(transform.position, previousTransform.position);
float distance = transform.position.x - previousTransform;
previousTransform = transform.position.x;
// Debug.Log("Paddle-Water Impulse: " + distance);
return distance * IMPULSE;
}
void localApplyImpulse(float impulse)
{
if (PhotonNetwork.IsConnected)
if (photonView.IsMine)
{
// add code here
photonView.RPC("applyImpulse", RpcTarget.Others, impulse);
PhotonNetwork.SendAllOutgoingCommands();
}
applyImpulse(impulse);
photonView.RPC("applyImpulse", RpcTarget.Others, impulse, playerPosition);
PhotonNetwork.SendAllOutgoingCommands();
applyImpulse(impulse, playerPosition);
}
[PunRPC]
void applyImpulse(float impulse)
void applyImpulse(float impulse, PlayerPosition position)
{
if (playerPosition == PlayerPosition.Left)
if (position == PlayerPosition.Left)
{
boat.GetComponent<Boat>().leftPaddleImpulse(impulse);
}
......
Assets/Resources/Interaction/DesktopNavigation.cs
+ 4
− 0
View file @ 3598df89
......@@ -25,6 +25,10 @@ namespace RVC {
}
}
if (!enableTranslate) {
transform.localPosition = new Vector3 (0, 0, 0) ;
}
}
}
......
Assets/Scenes/World.unity
+ 266
− 10
View file @ 3598df89
......@@ -252,7 +252,7 @@ Transform:
m_Children:
- {fileID: 300769988}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!45 &429772286
Skybox:
......@@ -358,7 +358,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &543091642
GameObject:
......@@ -454,6 +454,67 @@ Transform:
m_Father: {fileID: 835959439}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &550162694
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3480743842923672865, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_Name
value: GrabableCube (1)
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672866, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: sceneViewId
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1729946
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.y
value: 1.94
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.z
value: -9.05
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
--- !u!1 &619924992
GameObject:
m_ObjectHideFlags: 0
......@@ -549,7 +610,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &627835571
GameObject:
......@@ -646,7 +707,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &718884782
PrefabInstance:
......@@ -718,6 +779,67 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3736022095211866994, guid: 66bc021a1d6aceda5a5cc3ec680129eb, type: 3}
m_PrefabInstance: {fileID: 718884782}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &834276292
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3480743842923672865, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_Name
value: GrabableCube
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672866, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: sceneViewId
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1729946
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.y
value: 1.94
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.z
value: 8.154535
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
--- !u!1 &835959438
GameObject:
m_ObjectHideFlags: 0
......@@ -748,7 +870,7 @@ Transform:
m_Children:
- {fileID: 543091644}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1155598199
GameObject:
......@@ -909,7 +1031,7 @@ Transform:
- {fileID: 718884783}
- {fileID: 1488810615}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1536096528
GameObject:
......@@ -1006,7 +1128,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1691105992
GameObject:
......@@ -1038,7 +1160,7 @@ Transform:
m_Children:
- {fileID: 2027820249}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1697851640
GameObject:
......@@ -1135,7 +1257,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1758792023
GameObject:
......@@ -1232,8 +1354,130 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1826948299
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3480743842923672865, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_Name
value: GrabableCube (3)
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672866, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: sceneViewId
value: 8
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.x
value: 10.08
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.y
value: 1.94
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.z
value: 7.13
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
--- !u!1001 &1836075437
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3480743842923672865, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_Name
value: GrabableCube (2)
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672866, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: sceneViewId
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.x
value: 10.08
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.y
value: 1.94
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalPosition.z
value: -9.05
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3480743842923672873, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 080929d66eb9088c9b4bbb47791d018d, type: 3}
--- !u!1001 &2027820248
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1241,6 +1485,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1691105993}
m_Modifications:
- target: {fileID: 198710617466850141, guid: 7a7324a13ddf1717793e2b70ffa7d219, type: 3}
propertyPath: sceneViewId
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1519597276661954223, guid: 7a7324a13ddf1717793e2b70ffa7d219, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
......@@ -1261,6 +1509,14 @@ PrefabInstance:
propertyPath: sceneViewId
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3602055528326585661, guid: 7a7324a13ddf1717793e2b70ffa7d219, type: 3}
propertyPath: sceneViewId
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4025590747273808601, guid: 7a7324a13ddf1717793e2b70ffa7d219, type: 3}
propertyPath: sceneViewId
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5171243366982403910, guid: 7a7324a13ddf1717793e2b70ffa7d219, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
......
ProjectSettings/ProjectSettings.asset
+ 21
− 0
View file @ 3598df89
......@@ -177,6 +177,27 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 8805164628947938390, guid: 3db8ace1b1951458db29d11fbfa3510c, type: 2}
- {fileID: 5722415155357816245, guid: 74edabe08a864e144aa31d56ebf56186, type: 2}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment