AR初版可用阶段提交
This commit is contained in:
1 parent
dc8f8ceb80
commit
27d18d7d01
22 files changed
+4067
-3240
No files matched your search
@@ -37,6 +37,8 @@ namespace Assets.AR
|
||||
|
||||
public float ManualVisibility { get; set; }
|
||||
|
||||
public bool IsMain { get; set; }
|
||||
|
||||
public ARRoute Route
|
||||
{
|
||||
get => this.route;
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace Assets.AR
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual bool IsArObjectActive(ARObject arObject) => (double)arObject.VisibilityLevel > 0.0;
|
||||
protected virtual bool IsArObjectActive(ARObject arObject) => (double)arObject.VisibilityLevel > 0.0 ;
|
||||
|
||||
|
||||
protected virtual Material GetTrajectoryMaterial() => this.matShadow;
|
||||
@@ -128,7 +128,7 @@ namespace Assets.AR
|
||||
this.cameraPositionOffset = this.Route.GetCameraPosition(num1) - this.CameraOriginOffset;
|
||||
Camera.main.transform.position = this.CameraOriginOffset;
|
||||
Camera.main.transform.rotation = this.Route.GetCameraRotation(num1);
|
||||
this.Route.SetCameraProjection(num1, Camera.main);
|
||||
//this.Route.SetCameraProjection(num1, Camera.main); //TODO:暂时注释掉
|
||||
}
|
||||
this.CameraDistance = this.videoSync.GetDistanceForVideoFrame(num1 + this.FrameIndexDistanceCorrection);
|
||||
float num2 = Mathf.Min(float.MaxValue, this.Route.GetVisibility(num1));
|
||||
|
||||
@@ -76,8 +76,8 @@ namespace Assets.AR
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
if (manager.IsQuit())
|
||||
return;
|
||||
//if (manager.IsQuit())
|
||||
// return;
|
||||
|
||||
timers -= Time.deltaTime;
|
||||
|
||||
@@ -96,6 +96,7 @@ namespace Assets.AR
|
||||
item.DeltaDistance = (float)(dic.Key.EndDistance - dic.Key.PreDistance);
|
||||
item.Route = Route;
|
||||
item.VideoSync = videoPointsSync;
|
||||
item.IsAtFinish = dic.Key.EndDistance >= manager.GetMapRoute().Distance*1000f;
|
||||
if (!this.arObjects.Contains(item))
|
||||
this.arObjects.Add(item);
|
||||
if (!this.riderObjects.ContainsKey(item.GetInstanceID()))
|
||||
@@ -112,10 +113,6 @@ namespace Assets.AR
|
||||
var offset = obj.DeltaDistance * delta;
|
||||
obj.Distance += offset;
|
||||
obj.RouteDistance += offset;
|
||||
if (obj.Distance >= Route.GetTotalDistance())
|
||||
{
|
||||
obj.IsAtFinish = true;
|
||||
}
|
||||
}
|
||||
|
||||
this.FrameIndexDistanceCorrection = this.VideoPlayerControl.FrameIndexDistanceCorrection;
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace Assets.AR
|
||||
{
|
||||
public class ExampleClass : MonoBehaviour
|
||||
{
|
||||
public Matrix4x4 originalProjection;
|
||||
Camera cam;
|
||||
|
||||
void Start()
|
||||
{
|
||||
cam = GetComponent<Camera>();
|
||||
originalProjection = cam.projectionMatrix;
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
Matrix4x4 p = originalProjection;
|
||||
p.m01 += Mathf.Sin(Time.time * 1.2F) * 0.1F;
|
||||
p.m10 += Mathf.Sin(Time.time * 1.5F) * 0.1F;
|
||||
cam.projectionMatrix = p;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 202761b738f529a438db2134c721aae4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in new issue
Block a user