Addded Second Display to game

This commit is contained in:
Rabidus 2023-07-25 12:23:15 +03:00
parent 64fed56ad3
commit a75c7cb5aa
12 changed files with 2816 additions and 1643 deletions

Binary file not shown.

View File

@ -46,7 +46,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: ffab4c12024ba964abb234756aca0253, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -59,7 +59,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 51218e73a2662d04fbb8bd9e7f7482ce, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -12080,16 +12080,16 @@ MonoBehaviour:
useClippedPercent: 0 useClippedPercent: 0
keys: [] keys: []
_clipFromSample: _clipFromSample:
position: {x: -606.6558, y: 288.06433, z: -464.54907} position: {x: -606.65485, y: 288.06433, z: -464.5491}
up: {x: 0.07269505, y: 0.99126023, z: 0.1100838} up: {x: 0.072695054, y: 0.99126023, z: 0.1100838}
forward: {x: -0.62394154, y: -0.03606528, z: 0.78063846} forward: {x: -0.6239391, y: -0.03606533, z: 0.7806404}
color: {r: 1, g: 1, b: 1, a: 1} color: {r: 1, g: 1, b: 1, a: 1}
size: 1 size: 1
percent: 0 percent: 0
_clipToSample: _clipToSample:
position: {x: -606.6558, y: 288.06433, z: -464.54907} position: {x: -606.65485, y: 288.06433, z: -464.5491}
up: {x: 0.07269497, y: 0.99126023, z: 0.11008376} up: {x: 0.072694965, y: 0.99126023, z: 0.11008376}
forward: {x: -0.62394154, y: -0.03606528, z: 0.78063846} forward: {x: -0.6239391, y: -0.03606533, z: 0.7806404}
color: {r: 1, g: 1, b: 1, a: 1} color: {r: 1, g: 1, b: 1, a: 1}
size: 1 size: 1
percent: 1 percent: 1
@ -12134,16 +12134,16 @@ MonoBehaviour:
targetRigidbody2D: {fileID: 0} targetRigidbody2D: {fileID: 0}
targetTransform: {fileID: 7985013476349946332} targetTransform: {fileID: 7985013476349946332}
_result: _result:
position: {x: -606.6558, y: 288.06433, z: -464.54907} position: {x: -606.65485, y: 288.06433, z: -464.5491}
up: {x: 0.07269505, y: 0.99126023, z: 0.1100838} up: {x: 0.072695054, y: 0.99126023, z: 0.1100838}
forward: {x: -0.62394154, y: -0.03606528, z: 0.78063846} forward: {x: -0.6239391, y: -0.03606533, z: 0.7806404}
color: {r: 1, g: 1, b: 1, a: 1} color: {r: 1, g: 1, b: 1, a: 1}
size: 1 size: 1
percent: 0 percent: 0
_finalResult: _finalResult:
position: {x: -606.6558, y: 288.06433, z: -464.54907} position: {x: -606.65485, y: 288.06433, z: -464.5491}
up: {x: 0.07269505, y: 0.99126023, z: 0.1100838} up: {x: 0.072695054, y: 0.99126023, z: 0.1100838}
forward: {x: -0.62394154, y: -0.03606528, z: 0.78063846} forward: {x: -0.6239391, y: -0.03606533, z: 0.7806404}
color: {r: 1, g: 1, b: 1, a: 1} color: {r: 1, g: 1, b: 1, a: 1}
size: 1 size: 1
percent: 0 percent: 0
@ -12504,7 +12504,7 @@ MonoBehaviour:
m_StopNaN: 0 m_StopNaN: 0
m_Dithering: 0 m_Dithering: 0
m_ClearDepth: 1 m_ClearDepth: 1
m_AllowXRRendering: 1 m_AllowXRRendering: 0
m_RequiresDepthTexture: 0 m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0 m_RequiresColorTexture: 0
m_Version: 2 m_Version: 2
@ -14948,6 +14948,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 966261301284021888, guid: dc03a465cabc90746a8ab420688757d1,
type: 3}
propertyPath: m_HDR
value: 1
objectReference: {fileID: 0}
- target: {fileID: 966261301284021888, guid: dc03a465cabc90746a8ab420688757d1, - target: {fileID: 966261301284021888, guid: dc03a465cabc90746a8ab420688757d1,
type: 3} type: 3}
propertyPath: far clip plane propertyPath: far clip plane
@ -15013,7 +15018,8 @@ PrefabInstance:
propertyPath: ForceGrab propertyPath: ForceGrab
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 3075193522572325490, guid: dc03a465cabc90746a8ab420688757d1, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: dc03a465cabc90746a8ab420688757d1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dc03a465cabc90746a8ab420688757d1, type: 3}
--- !u!4 &620310376748182588 stripped --- !u!4 &620310376748182588 stripped
Transform: Transform:
@ -15083,6 +15089,45 @@ MonoBehaviour:
m_Action: Calibrate Height m_Action: Calibrate Height
m_Flags: 0 m_Flags: 0
m_Flags: 0 m_Flags: 0
--- !u!1 &7185685602648102907 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 966261301282267196, guid: dc03a465cabc90746a8ab420688757d1,
type: 3}
m_PrefabInstance: {fileID: 7985013476245927879}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7985013477229222496
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7185685602648102907}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!4 &7185685602674956689 stripped --- !u!4 &7185685602674956689 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 966261301251419734, guid: dc03a465cabc90746a8ab420688757d1, m_CorrespondingSourceObject: {fileID: 966261301251419734, guid: dc03a465cabc90746a8ab420688757d1,

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,15 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ActivateAllDisplays : MonoBehaviour
{
private void Start()
{
Debug.Log("displays connected: " + Display.displays.Length);
for (int i = 1; i < Display.displays.Length; i++)
{
Display.displays[i].Activate();
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b1bb771dbb615e44eae6c026017e1630
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,15 +5,15 @@ using UnityEngine;
public class UIController : MonoBehaviour public class UIController : MonoBehaviour
{ {
[SerializeField] [SerializeField]
private GameObject _startMenu; private List<GameObject> _panels = new List<GameObject>();
public void ShowMenu() public void ShowMenu()
{ {
_startMenu.SetActive(true); _panels.ForEach(x => x.SetActive(true));
} }
public void HideMenu() public void HideMenu()
{ {
_startMenu.SetActive(false); _panels.ForEach(x => x.SetActive(false));
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,16 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

View File

@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

View File

@ -148,7 +148,9 @@ PlayerSettings:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 11400000, guid: b3ac24369c63cb246976bcaf96adab11, type: 2} - {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0} - {fileID: 0}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0