matt/RothenburgAR
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

3D objects are now loaded directly from .obj

Browse Source 
>10s loading time on a nexus 5x, needs rework
This commit is contained in:
Matt
2018-09-27 13:42:22 +02:00
parent d55aea9ea4
commit ed9fb4bce1
12 changed files with 693 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/RothenburgAR/Scripts/PointOfInterest/PoiData.cs
View File

@@ -34,8 +34,7 @@ namespace RothenburgAR.PointOfInterest
{
if (!HasModelDescription)
return null;
var modelPrefab = GetModelPrefab();
var gameObject = UnityEngine.Object.Instantiate(modelPrefab);
var gameObject = GetModelPrefab();
gameObject.transform.localRotation = Quaternion.identity;
gameObject.transform.localScale = ModelDescription.Scale;

9
Assets/RothenburgAR/Scripts/PointOfInterest/PoiModelLoader.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
using RothenburgAR.Common;
using System.IO;
using UnityEngine;
namespace RothenburgAR.PointOfInterest
@@ -7,17 +8,21 @@ namespace RothenburgAR.PointOfInterest
{
public GameObject LoadModel(PoiModelDescription description)
{
if (!File.Exists(description.ModelPath))
var path = PathHelper.CombinePaths(PathHelper.MediaPath, description.ModelPath, description.ModelPath + ".obj");
if (!File.Exists(path))
{
throw new FileNotFoundException(description.ModelPath + " does not exist;");
}
return OBJLoader.LoadOBJFile(path);
var asset = AssetBundle.LoadFromFile(description.ModelPath);
if (!asset)
{
Debug.Log("Failed to load AssetBundle!");
return null;
}
var prefab = asset.LoadAsset(description.ModelPrefabName) as GameObject;
prefab.transform.localScale = description.Scale;

2
Assets/RothenburgAR/Scripts/PointOfInterest/PoiXmlPreloader.cs
View File

@@ -70,7 +70,7 @@ namespace RothenburgAR.PointOfInterest
var poiModelDescription = new PoiModelDescription
{
ModelPath = Path.Combine(poiDirectory, pathNode.Attributes["value"].Value),
ModelPath = pathNode.Attributes["value"].Value,
ModelPrefabName = pathNode.Attributes["prefabName"].Value,
Scale = GetVector3FromXmlNode(scaleNode).GetValueOrDefault(Vector3.one),
Rotation = GetVector3FromXmlNode(rotationNode).GetValueOrDefault(Vector3.zero),