Added Site Data

This commit is contained in:
sebastianhampel1 2023-04-09 22:30:54 -04:00
parent d4e49ea8e5
commit deda6a7810
25 changed files with 20228 additions and 4 deletions

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 42a817e1911134644ad5984336f4b65a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1182,7 +1182,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -3.95
objectReference: {fileID: 0}
- target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_LocalPosition.y
@ -1190,7 +1190,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -0.09
objectReference: {fileID: 0}
- target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_LocalRotation.w
@ -1236,6 +1236,10 @@ PrefabInstance:
propertyPath: m_PropertySheet.m_Float.m_Array.Array.data[3].m_Overridden
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2646791548413725038, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_PropertySheet.m_Vector3f.m_Array.Array.data[0].m_Value.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646791548413725038, guid: 921205ad18755e043ab119bf41a01a60, type: 3}
propertyPath: m_PropertySheet.m_Vector3f.m_Array.Array.data[0].m_Value.y
value: 0

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ebfe2b66ea34ee8478703b2f8705084a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using static UnityEngine.UI.Image;
public class PistolComponent : MonoBehaviour
{
@ -10,6 +11,7 @@ public class PistolComponent : MonoBehaviour
private bool IsEnabled = false;
GameObject targetObject;
[SerializeField]
GameObject targetObjectPrefab;
[SerializeField]
@ -21,6 +23,8 @@ public class PistolComponent : MonoBehaviour
[SerializeField]
private float maxProjectileDuration = 5f;
//private Dictionary<int,float> projectiles = new Dictionary<int, float>();
// Start is called before the first frame update
@ -34,6 +38,21 @@ public class PistolComponent : MonoBehaviour
{
}
private float CalculateDrop(Vector3 origin,Vector3 destination,Vector3 force)
{
// Calculate the initial velocity required to reach the destination.
Vector3 displacement = destination - origin;
float time = Mathf.Sqrt(2f * displacement.magnitude / Physics.gravity.magnitude);
Vector3 velocity = (displacement - 0.5f * Physics.gravity * time * time) / time + force;
// Calculate the height the object will reach during its flight.
float maxHeight = origin.y + velocity.y * time - 0.5f * Physics.gravity.y * time * time;
// Calculate the distance the object will drop during its flight.
float dropDistance = maxHeight - destination.y;
return dropDistance;
}
private void FixedUpdate()
{
@ -44,6 +63,9 @@ public class PistolComponent : MonoBehaviour
if (Physics.Raycast(ray, out hit, 50))
{
targetObject.gameObject.transform.position = hit.point;
float drop = CalculateDrop(this.bulletSpawnPoint.position, hit.point, this.transform.up * this.firePower);
print(drop);
}
}

@ -207,7 +207,7 @@ public class PlayerInteractionHandler : MonoBehaviour
this.DisableFlashlight();
float aimAxis = Input.GetAxis("Aim");
print("Aim:" + aimAxis);
}
else
{

@ -28,6 +28,8 @@ public class PlayerMovementController : MonoBehaviour
[SerializeField]
private Camera cam;
[HideInInspector]
public bool AllowRotation = false;
@ -68,14 +70,20 @@ public class PlayerMovementController : MonoBehaviour
// Update is called once per frame
void Update()
{
AllowRotation = Input.GetMouseButton(1);
GetMovementOld();
MovePlayer();
animcontroller.Animate(new Vector2(x, y), false,isRunning);
this.lookingDirectionVector = ((cameraController.Forward * y) + cameraController.Right * x).normalized;
if (isRunning && !Input.GetMouseButton(1))
if (isRunning && !Input.GetMouseButtonDown(1)||AllowRotation)
{
if (AllowRotation && x == 0 && y == 0)
{
this.lookingDirectionVector = cameraController.Forward.normalized;
}
SlowLookAt(this.lookingDirectionVector);
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

(image error) Size: 434 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

(image error) Size: 869 KiB

Binary file not shown.

After

(image error) Size: 1005 KiB

Binary file not shown.

After

(image error) Size: 108 KiB

Binary file not shown.

After

(image error) Size: 86 KiB

Binary file not shown.

After

(image error) Size: 3.8 MiB

Binary file not shown.

After

(image error) Size: 909 KiB

Binary file not shown.

After

(image error) Size: 717 KiB

1
site_data/assets/js/script.min.js vendored Normal file

@ -0,0 +1 @@
!function(){"use strict";var e=document.querySelector("#mainNav");if(e){var o=e.querySelector(".navbar-collapse");if(o){var n=new bootstrap.Collapse(o,{toggle:!1}),t=o.querySelectorAll("a");for(var a of t)a.addEventListener("click",(function(e){n.hide()}))}var r=function(){(void 0!==window.pageYOffset?window.pageYOffset:(document.documentElement||document.body.parentNode||document.body).scrollTop)>100?e.classList.add("navbar-shrink"):e.classList.remove("navbar-shrink")};r(),document.addEventListener("scroll",r)}}();

5
site_data/index.html Normal file

File diff suppressed because one or more lines are too long