Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Commit

Permalink
BVH initial loading path changed
Browse files Browse the repository at this point in the history
  • Loading branch information
PoChang-Su committed Sep 28, 2018
1 parent 2b8133a commit 33657fd
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ Assets/_Local/
Assets/_Local.meta

/build_64

VRMViewer
VRMViewer.zip
5 changes: 3 additions & 2 deletions Assets/VRMViewer/Scripts/ViewerUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ private void Start()
_openBVH.onClick.AddListener(OnOpenClickedBVH);

// Load initial motion
string path = System.IO.Directory.GetCurrentDirectory() + "/Assets/StreamingAssets/test.txt";
if(File.Exists(path))
string path = Application.streamingAssetsPath + "/test.txt";

if (File.Exists(path))
{
LoadMotion(path);
_bvhPathSaved = path;
Expand Down
5 changes: 4 additions & 1 deletion ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/VRMViewer/Scenes/VRMViewer.unity
guid: 85df9aae94ba18845871d426dc15ed1b
27 changes: 17 additions & 10 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: UniVRMTest
companyName: Virtual Cast Co., Ltd.
productName: VRM Viewer 1.0
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
Expand Down Expand Up @@ -42,8 +42,8 @@ PlayerSettings:
m_SplashScreenBackgroundPortrait: {fileID: 0}
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
defaultScreenWidth: 1270
defaultScreenHeight: 720
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
Expand All @@ -55,7 +55,7 @@ PlayerSettings:
androidShowActivityIndicatorOnLoading: -1
tizenShowActivityIndicatorOnLoading: -1
iosAppInBackgroundBehavior: 0
displayResolutionDialog: 2
displayResolutionDialog: 1
iosAllowHTTPDownload: 1
allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1
Expand All @@ -67,13 +67,13 @@ PlayerSettings:
defaultIsFullScreen: 0
defaultIsNativeResolution: 1
runInBackground: 1
captureSingleScreen: 0
captureSingleScreen: 1
muteOtherAudioSources: 0
Prepare IOS For Recording: 0
submitAnalytics: 1
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
forceSingleInstance: 1
resizableWindow: 1
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
Expand All @@ -85,7 +85,7 @@ PlayerSettings:
xboxEnableKinectAutoTracking: 0
xboxEnableFitness: 0
visibleInBackground: 1
allowFullscreenSwitch: 0
allowFullscreenSwitch: 1
graphicsJobMode: 0
macFullscreenMode: 2
d3d9FullscreenMode: 1
Expand Down Expand Up @@ -222,8 +222,15 @@ PlayerSettings:
height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
resolutionDialogBanner: {fileID: 2800000, guid: 1a74d32d483bc7d4e9a6a5e145826b11,
type: 3}
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 1a74d32d483bc7d4e9a6a5e145826b11, type: 3}
m_Width: 128
m_Height: 128
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
m_BuildTargetVRSettings: []
Expand Down

0 comments on commit 33657fd

Please sign in to comment.