Compare commits
No commits in common. "master" and "Patched" have entirely different histories.
25
.gitattributes
vendored
25
.gitattributes
vendored
@ -1,8 +1,8 @@
|
|||||||
* text=auto
|
* text=auto
|
||||||
# Unity files
|
# Unity files
|
||||||
*.meta -text merge=unityyamlmerge diff
|
*.meta -text merge=unityyamlmerge diff
|
||||||
*.unity filter=lfs diff=lfs merge=lfs -text
|
*.unity -text merge=unityyamlmerge diff
|
||||||
*.asset filter=lfs diff=lfs merge=lfs -text
|
*.asset -text merge=unityyamlmerge diff
|
||||||
*.prefab -text merge=unityyamlmerge diff
|
*.prefab -text merge=unityyamlmerge diff
|
||||||
*.mat -text merge=unityyamlmerge diff
|
*.mat -text merge=unityyamlmerge diff
|
||||||
*.anim -text merge=unityyamlmerge diff
|
*.anim -text merge=unityyamlmerge diff
|
||||||
@ -79,24 +79,3 @@
|
|||||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
*.exr filter=lfs diff=lfs merge=lfs -text
|
||||||
*.hdr filter=lfs diff=lfs merge=lfs -text
|
*.hdr filter=lfs diff=lfs merge=lfs -text
|
||||||
*.cubemap filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.assets filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.resS filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.dylib filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.tar.7z filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.f8 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Assets/_PROJECT/Components/Portals2/New[[:space:]]Cubemap.cubemap filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Assets/_PROJECT/Other/Delta[[:space:]](Toomas)[[:space:]]v3.blend filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Assets/_PROJECT/Other/Delta[[:space:]](Toomas)[[:space:]]v3.blend1 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Assets/_PROJECT/Scenes/DeltaBuilding_base/LightingData.asset filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Build/DeltaVR_Data/level0 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Build/DeltaVR_Data/sharedassets0.assets filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Build/DeltaVR_Data/sharedassets0.assets.resS filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/Artifacts/6e/6e8680668429d5a691eb5372cd18a3f8 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/PackageCache/com.unity.burst@1.8.3/.Runtime/libburst-llvm-14.dylib filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/PackageCache/com.unity.toolchain.win-x86_64-linux-x86_64@2.0.4/data~/payload.tar.7z filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/PlayerDataCache/Win64/Data/level0 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/PlayerDataCache/Win64/Data/sharedassets0.assets filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS filter=lfs diff=lfs merge=lfs -text
|
|
||||||
Assets/_PROJECT/Scenes/DeltaBuilding_base.unity filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ext filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -73,7 +73,3 @@ crashlytics-build.properties
|
|||||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||||
Recordings/
|
Recordings/
|
||||||
|
|
||||||
# Paid assets
|
|
||||||
/[Aa]ssets/Magic Light Probes/*
|
|
||||||
/[Aa]ssets/[Bb]akery/*
|
|
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "1.0",
|
|
||||||
"components": [
|
|
||||||
"Microsoft.VisualStudio.Workload.ManagedGame"
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEngine.InputSystem;
|
|
||||||
using UnityEngine.XR.Interaction.Toolkit;
|
|
||||||
|
|
||||||
public class ActivateTeleportationRay : MonoBehaviour
|
|
||||||
{
|
|
||||||
public GameObject teleportRay;
|
|
||||||
public float rayHideDelay = 0.1f;
|
|
||||||
|
|
||||||
public InputActionProperty activateTeleportRay;
|
|
||||||
public TeleportationProvider teleportationProvider;
|
|
||||||
|
|
||||||
// Update is called once per frame
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
teleportRay.SetActive(false);
|
|
||||||
activateTeleportRay.action.performed += ShowRay;
|
|
||||||
activateTeleportRay.action.canceled += HideRayPerformed;
|
|
||||||
teleportationProvider.endLocomotion += HideRayPerformed;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HideRayPerformed(InputAction.CallbackContext obj)
|
|
||||||
{
|
|
||||||
if (!teleportRay.activeSelf) return;
|
|
||||||
if (IsInvoking(nameof(HideRay))) return;
|
|
||||||
Invoke(nameof(HideRay), rayHideDelay);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HideRayPerformed(LocomotionSystem obj)
|
|
||||||
{
|
|
||||||
if (!teleportRay.activeSelf) return;
|
|
||||||
if (IsInvoking(nameof(HideRay))) return;
|
|
||||||
Invoke(nameof(HideRay), rayHideDelay);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ShowRay(InputAction.CallbackContext obj)
|
|
||||||
{
|
|
||||||
teleportRay.SetActive(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HideRay()
|
|
||||||
{
|
|
||||||
teleportRay.SetActive(false);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f9a0cd93f35359040bf696149b914da4
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,107 +0,0 @@
|
|||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class Billboard : MonoBehaviour
|
|
||||||
{
|
|
||||||
private GameObject _parent;
|
|
||||||
public string defaultText = "Sample Text";
|
|
||||||
public TMP_Text tmpText;
|
|
||||||
public Canvas canvas;
|
|
||||||
public string prefix = "<mark=#000000BB>";
|
|
||||||
private Camera _camera;
|
|
||||||
|
|
||||||
public LineRenderer lineRenderer;
|
|
||||||
public Transform lineStart;
|
|
||||||
|
|
||||||
private GameObject _lineEndObject;
|
|
||||||
private MeshFilter _lineEndMeshFilter;
|
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
_camera = Camera.main;
|
|
||||||
lineRenderer = GetComponent<LineRenderer>();
|
|
||||||
_parent = transform.parent.gameObject;
|
|
||||||
transform.SetParent(null);
|
|
||||||
tmpText.text = defaultText;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LateUpdate()
|
|
||||||
{
|
|
||||||
if (canvas.enabled) transform.position = _parent.transform.position + (_camera.transform.up * 0.1f);
|
|
||||||
if (!lineRenderer.enabled) return;
|
|
||||||
|
|
||||||
lineRenderer.SetPosition(0, lineStart.position);
|
|
||||||
lineRenderer.SetPosition(1, CalculateLineEndPosition());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetText(string txt)
|
|
||||||
{
|
|
||||||
tmpText.text = prefix + txt;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void ShowCanvas()
|
|
||||||
{
|
|
||||||
canvas.enabled = true;
|
|
||||||
lineRenderer.enabled = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HideCanvas()
|
|
||||||
{
|
|
||||||
canvas.enabled = false;
|
|
||||||
lineRenderer.enabled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ShowHint(string txt)
|
|
||||||
{
|
|
||||||
ShowCanvas();
|
|
||||||
SetText(txt);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void HideHint()
|
|
||||||
{
|
|
||||||
HideCanvas();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetLineTarget(GameObject newGM)
|
|
||||||
{
|
|
||||||
_lineEndObject = newGM;
|
|
||||||
_lineEndMeshFilter = _lineEndObject.GetComponent<MeshFilter>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Vector3 CalculateLineEndPosition()
|
|
||||||
{
|
|
||||||
if (_lineEndObject == null)
|
|
||||||
{
|
|
||||||
lineRenderer.enabled = false;
|
|
||||||
return Vector3.zero;
|
|
||||||
}
|
|
||||||
return _lineEndMeshFilter == null ? _lineEndObject.transform.position : FindClosestVertexToTargetPoint(lineStart.position, _lineEndMeshFilter);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Vector3 FindClosestVertexToTargetPoint(Vector3 start, MeshFilter filter)
|
|
||||||
{
|
|
||||||
// Get the Mesh object from the MeshFilter component
|
|
||||||
Mesh mesh = filter.mesh;
|
|
||||||
// Get the world position of the point you want to find the closest point on the mesh to
|
|
||||||
// Transform the point into local space relative to the MeshFilter's transform
|
|
||||||
Vector3 localPoint = filter.transform.InverseTransformPoint(start);
|
|
||||||
|
|
||||||
// Find the closest vertex to the point
|
|
||||||
float closestDistance = Mathf.Infinity;
|
|
||||||
Vector3 closestVertex = Vector3.zero;
|
|
||||||
for (int i = 0; i < mesh.vertexCount; i++)
|
|
||||||
{
|
|
||||||
Vector3 vertex = mesh.vertices[i];
|
|
||||||
float distance = Vector3.Distance(localPoint, vertex);
|
|
||||||
if (distance < closestDistance)
|
|
||||||
{
|
|
||||||
closestDistance = distance;
|
|
||||||
closestVertex = vertex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Transform the closest vertex back into world space
|
|
||||||
return filter.transform.TransformPoint(closestVertex);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 579b0d81f2e914541899696ba12066cc
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
91
Assets/Blueprints/1021.PNG.meta
Normal file
91
Assets/Blueprints/1021.PNG.meta
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9e61fd46af9c1f040b404e6d9b3cf24f
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 10
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: -1
|
||||||
|
wrapV: -1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user