Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Failframeit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FrameIT
Failframeit
Commits
f6e67e17
Commit
f6e67e17
authored
4 years ago
by
Richard Marcus
Browse files
Options
Downloads
Patches
Plain Diff
state of current builds
parent
fa1b5a44
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Assets/StartServer.cs
+35
-12
35 additions, 12 deletions
Assets/StartServer.cs
Assets/TreeWorld_02.unity
+155
-73
155 additions, 73 deletions
Assets/TreeWorld_02.unity
Assets/empty.unity
+265
-0
265 additions, 0 deletions
Assets/empty.unity
Assets/empty.unity.meta
+7
-0
7 additions, 0 deletions
Assets/empty.unity.meta
with
462 additions
and
85 deletions
Assets/StartServer.cs
+
35
−
12
View file @
f6e67e17
...
...
@@ -80,24 +80,44 @@ IEnumerator ServerRoutine()
yield
return
request
.
SendWebRequest
();
if
(
request
.
isNetworkError
||
request
.
isHttpError
)
{
UnityEngine
.
Debug
.
Log
(
"no running server
"
);
UnityEngine
.
Debug
.
Log
(
"no running server
"
+
request
.
error
);
// int exitCode;
#if!UNITY_WEBGL
// int exitCode;
ProcessStartInfo
processInfo
;
Process
process
;
#if UNITY_STANDALONE_LINUX
ProcessStartInfo
proc
=
new
ProcessStartInfo
();
proc
.
FileName
=
"xdg-open"
;
proc
.
WorkingDirectory
=
Application
.
streamingAssetsPath
;
proc
.
Arguments
=
"startServer.sh "
+
Application
.
streamingAssetsPath
;
proc
.
WindowStyle
=
ProcessWindowStyle
.
Minimized
;
proc
.
CreateNoWindow
=
true
;
process
=
Process
.
Start
(
proc
);
ProcessStartInfo
proc
=
new
ProcessStartInfo
();
proc
.
FileName
=
"bash"
;
// proc.WorkingDirectory = Application.streamingAssetsPath;
proc
.
Arguments
=
Application
.
streamingAssetsPath
+
"/startServer.sh"
;
// + " \"" +Application.streamingAssetsPath + "\"";
proc
.
WindowStyle
=
ProcessWindowStyle
.
Normal
;
proc
.
CreateNoWindow
=
false
;
proc
.
UseShellExecute
=
true
;
process
=
Process
.
Start
(
proc
);
#elif UNITY_STANDALONE_OSX
/*
ProcessStartInfo proc = new ProcessStartInfo();//"open", "sh startServer.sh");// + " \"" +Application.streamingAssetsPath + "\"");
proc.FileName = "/bin/bash";
proc.WorkingDirectory = Application.streamingAssetsPath;
proc.Arguments = "sh " + Application.streamingAssetsPath+"/startServer.sh";
proc.CreateNoWindow = false;
proc.UseShellExecute = true;
process = Process.Start(proc);
*/
ProcessStartInfo
proc
=
new
ProcessStartInfo
();
String
startServerPath
=
Application
.
streamingAssetsPath
+
"/startServer.sh"
;
String
runWithTerminalPath
=
Application
.
streamingAssetsPath
+
"/startInTerminal.sh"
;
proc
.
FileName
=
"/bin/bash"
;
proc
.
Arguments
=
runWithTerminalPath
+
" /bin/bash "
+
startServerPath
;
proc
.
CreateNoWindow
=
false
;
proc
.
UseShellExecute
=
true
;
process
=
Process
.
Start
(
proc
);
#else
string
command
=
""
;
...
...
@@ -118,7 +138,7 @@ IEnumerator ServerRoutine()
process
=
Process
.
Start
(
processInfo
);
#endif
yield
return
null
;
#endif
while
(
true
)
{
request
=
UnityWebRequest
.
Get
(
"localhost:8081/scroll/list"
);
...
...
@@ -142,13 +162,16 @@ IEnumerator ServerRoutine()
//string output = process.StandardOutput.ReadToEnd();
//string error = process.StandardError.ReadToEnd();
// exitCode = process.ExitCode;
// exitCode = process.ExitCode;
// UnityEngine.Debug.Log(output);
// UnityEngine.Debug.Log(error);
// Console.WriteLine("output>>" + (String.IsNullOrEmpty(output) ? "(none)" : output));
// Console.WriteLine("error>>" + (String.IsNullOrEmpty(error) ? "(none)" : error));
// Console.WriteLine("ExitCode: " + exitCode.ToString(), "ExecuteCommand");
#if !UNITY_WEBGL
process
.
Close
();
#endif
}
PrepareGame
();
...
...
This diff is collapsed.
Click to expand it.
Assets/TreeWorld_02.unity
+
155
−
73
View file @
f6e67e17
This diff is collapsed.
Click to expand it.
Assets/empty.unity
0 → 100644
+
265
−
0
View file @
f6e67e17
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!29
&1
OcclusionCullingSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_OcclusionBakeSettings
:
smallestOccluder
:
5
smallestHole
:
0.25
backfaceThreshold
:
100
m_SceneGUID
:
00000000000000000000000000000000
m_OcclusionCullingData
:
{
fileID
:
0
}
---
!u!104
&2
RenderSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
9
m_Fog
:
0
m_FogColor
:
{
r
:
0.5
,
g
:
0.5
,
b
:
0.5
,
a
:
1
}
m_FogMode
:
3
m_FogDensity
:
0.01
m_LinearFogStart
:
0
m_LinearFogEnd
:
300
m_AmbientSkyColor
:
{
r
:
0.212
,
g
:
0.227
,
b
:
0.259
,
a
:
1
}
m_AmbientEquatorColor
:
{
r
:
0.114
,
g
:
0.125
,
b
:
0.133
,
a
:
1
}
m_AmbientGroundColor
:
{
r
:
0.047
,
g
:
0.043
,
b
:
0.035
,
a
:
1
}
m_AmbientIntensity
:
1
m_AmbientMode
:
0
m_SubtractiveShadowColor
:
{
r
:
0.42
,
g
:
0.478
,
b
:
0.627
,
a
:
1
}
m_SkyboxMaterial
:
{
fileID
:
10304
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_HaloStrength
:
0.5
m_FlareStrength
:
1
m_FlareFadeSpeed
:
3
m_HaloTexture
:
{
fileID
:
0
}
m_SpotCookie
:
{
fileID
:
10001
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_DefaultReflectionMode
:
0
m_DefaultReflectionResolution
:
128
m_ReflectionBounces
:
1
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0.44657898
,
g
:
0.4964133
,
b
:
0.5748178
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
LightmapSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
11
m_GIWorkflowMode
:
0
m_GISettings
:
serializedVersion
:
2
m_BounceScale
:
1
m_IndirectOutputScale
:
1
m_AlbedoBoost
:
1
m_EnvironmentLightingMode
:
0
m_EnableBakedLightmaps
:
1
m_EnableRealtimeLightmaps
:
1
m_LightmapEditorSettings
:
serializedVersion
:
10
m_Resolution
:
2
m_BakeResolution
:
40
m_AtlasSize
:
1024
m_AO
:
0
m_AOMaxDistance
:
1
m_CompAOExponent
:
1
m_CompAOExponentDirect
:
0
m_Padding
:
2
m_LightmapParameters
:
{
fileID
:
0
}
m_LightmapsBakeMode
:
1
m_TextureCompression
:
1
m_FinalGather
:
0
m_FinalGatherFiltering
:
1
m_FinalGatherRayCount
:
256
m_ReflectionCompression
:
2
m_MixedBakeMode
:
2
m_BakeBackend
:
1
m_PVRSampling
:
1
m_PVRDirectSampleCount
:
32
m_PVRSampleCount
:
500
m_PVRBounces
:
2
m_PVRFilterTypeDirect
:
0
m_PVRFilterTypeIndirect
:
0
m_PVRFilterTypeAO
:
0
m_PVRFilteringMode
:
1
m_PVRCulling
:
1
m_PVRFilteringGaussRadiusDirect
:
1
m_PVRFilteringGaussRadiusIndirect
:
5
m_PVRFilteringGaussRadiusAO
:
2
m_PVRFilteringAtrousPositionSigmaDirect
:
0.5
m_PVRFilteringAtrousPositionSigmaIndirect
:
2
m_PVRFilteringAtrousPositionSigmaAO
:
1
m_ShowResolutionOverlay
:
1
m_LightingDataAsset
:
{
fileID
:
0
}
m_UseShadowmask
:
1
---
!u!196
&4
NavMeshSettings
:
serializedVersion
:
2
m_ObjectHideFlags
:
0
m_BuildSettings
:
serializedVersion
:
2
agentTypeID
:
0
agentRadius
:
0.5
agentHeight
:
2
agentSlope
:
45
agentClimb
:
0.4
ledgeDropHeight
:
0
maxJumpAcrossDistance
:
0
minRegionArea
:
2
manualCellSize
:
0
cellSize
:
0.16666667
manualTileSize
:
0
tileSize
:
256
accuratePlacement
:
0
debug
:
m_Flags
:
0
m_NavMeshData
:
{
fileID
:
0
}
---
!u!1
&937283486
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
937283488
}
-
component
:
{
fileID
:
937283487
}
m_Layer
:
0
m_Name
:
Directional Light
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!108
&937283487
Light
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
937283486
}
m_Enabled
:
1
serializedVersion
:
8
m_Type
:
1
m_Color
:
{
r
:
1
,
g
:
0.95686275
,
b
:
0.8392157
,
a
:
1
}
m_Intensity
:
1
m_Range
:
10
m_SpotAngle
:
30
m_CookieSize
:
10
m_Shadows
:
m_Type
:
2
m_Resolution
:
-1
m_CustomResolution
:
-1
m_Strength
:
1
m_Bias
:
0.05
m_NormalBias
:
0.4
m_NearPlane
:
0.2
m_Cookie
:
{
fileID
:
0
}
m_DrawHalo
:
0
m_Flare
:
{
fileID
:
0
}
m_RenderMode
:
0
m_CullingMask
:
serializedVersion
:
2
m_Bits
:
4294967295
m_Lightmapping
:
4
m_LightShadowCasterMode
:
0
m_AreaSize
:
{
x
:
1
,
y
:
1
}
m_BounceIntensity
:
1
m_ColorTemperature
:
6570
m_UseColorTemperature
:
0
m_ShadowRadius
:
0
m_ShadowAngle
:
0
---
!u!4
&937283488
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
937283486
}
m_LocalRotation
:
{
x
:
0.40821788
,
y
:
-0.23456968
,
z
:
0.10938163
,
w
:
0.8754261
}
m_LocalPosition
:
{
x
:
0
,
y
:
3
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
50
,
y
:
-30
,
z
:
0
}
---
!u!1
&2073630061
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
2073630064
}
-
component
:
{
fileID
:
2073630063
}
-
component
:
{
fileID
:
2073630062
}
m_Layer
:
0
m_Name
:
Main Camera
m_TagString
:
MainCamera
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!81
&2073630062
AudioListener
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2073630061
}
m_Enabled
:
1
---
!u!20
&2073630063
Camera
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2073630061
}
m_Enabled
:
1
serializedVersion
:
2
m_ClearFlags
:
1
m_BackGroundColor
:
{
r
:
0.19215687
,
g
:
0.3019608
,
b
:
0.4745098
,
a
:
0
}
m_projectionMatrixMode
:
1
m_SensorSize
:
{
x
:
36
,
y
:
24
}
m_LensShift
:
{
x
:
0
,
y
:
0
}
m_GateFitMode
:
2
m_FocalLength
:
50
m_NormalizedViewPortRect
:
serializedVersion
:
2
x
:
0
y
:
0
width
:
1
height
:
1
near clip plane
:
0.3
far clip plane
:
1000
field of view
:
60
orthographic
:
0
orthographic size
:
5
m_Depth
:
-1
m_CullingMask
:
serializedVersion
:
2
m_Bits
:
4294967295
m_RenderingPath
:
-1
m_TargetTexture
:
{
fileID
:
0
}
m_TargetDisplay
:
0
m_TargetEye
:
3
m_HDR
:
1
m_AllowMSAA
:
1
m_AllowDynamicResolution
:
0
m_ForceIntoRT
:
0
m_OcclusionCulling
:
1
m_StereoConvergence
:
10
m_StereoSeparation
:
0.022
---
!u!4
&2073630064
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2073630061
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
1
,
z
:
-10
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
This diff is collapsed.
Click to expand it.
Assets/empty.unity.meta
0 → 100644
+
7
−
0
View file @
f6e67e17
fileFormatVersion: 2
guid: adc258ad592835340b9d3ecec180d100
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment