Skip to content

Commit de3fffe

Browse files
committed
Some GUI stuff
1 parent 6724be4 commit de3fffe

13 files changed

+45
-24
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.apk
1+
*.apk
2+
Temp/

.vs/RL Replays/v14/.suo

126 KB
Binary file not shown.

Assembly-CSharp-Editor.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@
327327
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
328328
<HintPath>E:/Programs/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
329329
</Reference>
330+
<Reference Include="zxing.unity">
331+
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/zxing.unity.dll</HintPath>
332+
</Reference>
330333
<Reference Include="Google.IOSResolver_v1.2.88.0">
331334
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.88.0.dll</HintPath>
332335
</Reference>
@@ -357,9 +360,6 @@
357360
<Reference Include="UnityEngine.StandardEvents">
358361
<HintPath>C:/Users/Matt/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
359362
</Reference>
360-
<Reference Include="zxing.unity">
361-
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/zxing.unity.dll</HintPath>
362-
</Reference>
363363
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
364364
<HintPath>E:/Programs/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
365365
</Reference>

Assembly-CSharp.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@
407407
<Reference Include="UnityEngine.SpatialTracking">
408408
<HintPath>E:/Programs/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
409409
</Reference>
410+
<Reference Include="zxing.unity">
411+
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/zxing.unity.dll</HintPath>
412+
</Reference>
410413
<Reference Include="Newtonsoft.Json">
411414
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/UnityPackages/JsonNet/Newtonsoft.Json.dll</HintPath>
412415
</Reference>
@@ -416,9 +419,6 @@
416419
<Reference Include="UnityEngine.StandardEvents">
417420
<HintPath>C:/Users/Matt/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
418421
</Reference>
419-
<Reference Include="zxing.unity">
420-
<HintPath>D:/Users/Matt/Documents/RL Replays/Assets/zxing.unity.dll</HintPath>
421-
</Reference>
422422
<Reference Include="mscorlib">
423423
<HintPath>E:/Programs/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/mscorlib.dll</HintPath>
424424
</Reference>

Assets/GoogleARCore/Examples/HelloAR/Scripts/HelloARController.cs

+32
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System.Collections;
2323
using System.Collections.Generic;
2424
using Newtonsoft.Json;
25+
using UnityEngine.SceneManagement;
2526

2627
namespace GoogleARCore.Examples.HelloAR
2728
{
@@ -102,6 +103,7 @@ public class HelloARController : MonoBehaviour
102103
private int currentFrame = 0;
103104
private List<GameObject> cars = new List<GameObject>();
104105
private List<GameObject> names = new List<GameObject>();
106+
private float hSliderValue = 1000f;
105107
public void Start()
106108
{
107109
BASE_URL = StaticReplayScript.URL;
@@ -267,6 +269,36 @@ public void Update()
267269
}
268270
}
269271

272+
273+
274+
public void OnGUI()
275+
{
276+
var zoomOut = GUI.Button(new Rect(25 + 150, 25, 30, 30), "-");
277+
var zoomIn = GUI.Button(new Rect(25 + 150 + 50, 25, 30, 30), "+");
278+
if (zoomOut)
279+
{
280+
scaleFactor += 100;
281+
}
282+
else if (zoomIn)
283+
{
284+
scaleFactor -= 100;
285+
}
286+
287+
if (gameData != null)
288+
{
289+
currentTime = GUI.HorizontalSlider(new Rect(25 + 150, 35, 200, 30), currentTime, (float)gameData.frames[0][2], (float) gameData.frames[gameData.frames.Count - 1][2]);
290+
291+
}
292+
293+
294+
// Button
295+
var back = GUI.Button(new Rect(25, 25, 100, 30), "Back to QR");
296+
if (back)
297+
{
298+
SceneManager.LoadScene("QRCode");
299+
}
300+
}
301+
270302
/// <summary>
271303
/// Check and update the application lifecycle.
272304
/// </summary>

Library/EditorInstance.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"process_id" : 15864,
3+
"version" : "2018.2.14f1"
4+
}
512 Bytes
Binary file not shown.
372 Bytes
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
08d63b2049a44b00.08d63b1ff16d4900

Library/assetDatabase3

0 Bytes
Binary file not shown.
Binary file not shown.

Library/shadercompiler-UnityShaderCompiler.exe0.log

-17
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ Cmd: initializeCompiler
44
Cmd: initializeCompiler
55
Cmd: initializeCompiler
66
Cmd: initializeCompiler
7-
Cmd: compileSnippet
8-
api=4 type=0 insize=1564 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
9-
Cmd: compileSnippet
10-
api=4 type=1 insize=1564 outsize=3790 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
117
Cmd: initializeCompiler
128
Cmd: initializeCompiler
139
Cmd: initializeCompiler
@@ -24,16 +20,3 @@ Cmd: initializeCompiler
2420
Cmd: initializeCompiler
2521
Cmd: initializeCompiler
2622
Cmd: initializeCompiler
27-
Cmd: initializeCompiler
28-
Cmd: initializeCompiler
29-
Cmd: initializeCompiler
30-
Cmd: initializeCompiler
31-
Cmd: initializeCompiler
32-
Cmd: initializeCompiler
33-
Cmd: initializeCompiler
34-
Cmd: initializeCompiler
35-
Cmd: initializeCompiler
36-
Cmd: compileSnippet
37-
api=4 type=0 insize=4971 outsize=1138 kw= pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
38-
Cmd: compileSnippet
39-
api=4 type=1 insize=4971 outsize=3494 kw= pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
Binary file not shown.

0 commit comments

Comments
 (0)