From 2cc5981bba8d90e8577a0a17b10cec946883f9f8 Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Thu, 14 Dec 2023 19:37:24 +0100 Subject: [PATCH] heureka --- Assets/OutsideWorld/Skybox Outside.mat | 2 +- .../Materials/Picture.mat | 83 ---- .../{Materials.meta => Picture.meta} | 2 +- .../New Render Texture.renderTexture} | 2 +- .../New Render Texture.renderTexture.meta} | 2 +- .../Picture/OutsideCamera.prefab | 95 +++++ .../OutsideCamera.prefab.meta} | 5 +- .../{ => Picture}/Picture Variant.prefab | 35 +- .../{ => Picture}/Picture Variant.prefab.meta | 0 .../Picture/WallArt.cs | 105 +++++ .../Picture/WallArt.cs.meta} | 0 Assets/Scenes/SampleScene.unity | 390 +++++++++++++----- .../CameraFollower.cs => testscript.cs} | 7 +- Assets/testscript.cs.meta | 11 + DEBUG-SERVER/Dockerfile | 20 + DEBUG-SERVER/server.js | 44 ++ ProjectSettings/TagManager.asset | 3 +- ProjectSettings/TimelineSettings.asset | 16 + 18 files changed, 618 insertions(+), 204 deletions(-) delete mode 100644 Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat rename Assets/Prefabs/OVR Scene Manager Overrides/{Materials.meta => Picture.meta} (77%) rename Assets/Prefabs/OVR Scene Manager Overrides/{Picture.renderTexture => Picture/New Render Texture.renderTexture} (96%) rename Assets/Prefabs/OVR Scene Manager Overrides/{Picture.renderTexture.meta => Picture/New Render Texture.renderTexture.meta} (79%) create mode 100644 Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab rename Assets/Prefabs/OVR Scene Manager Overrides/{Materials/Picture.mat.meta => Picture/OutsideCamera.prefab.meta} (52%) rename Assets/Prefabs/OVR Scene Manager Overrides/{ => Picture}/Picture Variant.prefab (70%) rename Assets/Prefabs/OVR Scene Manager Overrides/{ => Picture}/Picture Variant.prefab.meta (100%) create mode 100644 Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs rename Assets/{OutsideWorld/CameraFollower.cs.meta => Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs.meta} (100%) rename Assets/{OutsideWorld/CameraFollower.cs => testscript.cs} (58%) create mode 100644 Assets/testscript.cs.meta create mode 100644 DEBUG-SERVER/Dockerfile create mode 100644 DEBUG-SERVER/server.js create mode 100644 ProjectSettings/TimelineSettings.asset diff --git a/Assets/OutsideWorld/Skybox Outside.mat b/Assets/OutsideWorld/Skybox Outside.mat index 8d8f2e9..bc810c5 100644 --- a/Assets/OutsideWorld/Skybox Outside.mat +++ b/Assets/OutsideWorld/Skybox Outside.mat @@ -87,5 +87,5 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _GroundColor: {r: 1, g: 0, b: 0.16083908, a: 1} - - _SkyTint: {r: 1, g: 0.12790698, b: 0, a: 1} + - _SkyTint: {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat b/Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat deleted file mode 100644 index 9900c74..0000000 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Picture - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 8400000, guid: 79af35de64be2431ab8cdf3fc8cf7901, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Materials.meta b/Assets/Prefabs/OVR Scene Manager Overrides/Picture.meta similarity index 77% rename from Assets/Prefabs/OVR Scene Manager Overrides/Materials.meta rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture.meta index e3e874e..0dd0a2c 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Materials.meta +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bce3f6872ad4c5903ab11d463b55cc06 +guid: e3c0467b9c7bacfe493111016c49e7fb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture similarity index 96% rename from Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture index 7dd981f..eab6628 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture @@ -6,7 +6,7 @@ RenderTexture: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Picture + m_Name: New Render Texture m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture.meta b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture.meta similarity index 79% rename from Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture.meta rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture.meta index 6f82440..2e01937 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Picture.renderTexture.meta +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/New Render Texture.renderTexture.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79af35de64be2431ab8cdf3fc8cf7901 +guid: 408bdb50ea5c1fb9a9ba0b304a23937f NativeFormatImporter: externalObjects: {} mainObjectFileID: 8400000 diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab new file mode 100644 index 0000000..09e93b6 --- /dev/null +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8232122274264839316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4784789251146993980} + - component: {fileID: 1692076633779578516} + - component: {fileID: 3808655486643247338} + m_Layer: 0 + m_Name: OutsideCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4784789251146993980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232122274264839316} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.074949086, y: 0.46063435, z: 0.15247953} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &1692076633779578516 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232122274264839316} + 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_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + 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: 0 + 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!45 &3808655486643247338 +Skybox: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232122274264839316} + m_Enabled: 1 + m_CustomSkybox: {fileID: 2100000, guid: 3a95d6c22658210f5b76006bd8495252, type: 2} diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat.meta b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab.meta similarity index 52% rename from Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat.meta rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab.meta index 9f3af85..1a9a1fd 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Materials/Picture.mat.meta +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/OutsideCamera.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: bf8ba6bd0dde1644da76ec5be081ce71 -NativeFormatImporter: +guid: ac9fbe69dff6d1c7a93e664c3f5ae6c5 +PrefabImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture Variant.prefab b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/Picture Variant.prefab similarity index 70% rename from Assets/Prefabs/OVR Scene Manager Overrides/Picture Variant.prefab rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/Picture Variant.prefab index 28c77da..3bd418f 100644 --- a/Assets/Prefabs/OVR Scene Manager Overrides/Picture Variant.prefab +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/Picture Variant.prefab @@ -8,10 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 502283750161808342, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + propertyPath: m_Materials.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 502283750161808342, guid: 891349029806e4144812ff2d304d9cf9, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bf8ba6bd0dde1644da76ec5be081ce71, type: 2} + objectReference: {fileID: 2100000, guid: 85d01af80fd95b9cdbf12ee53d8a14b5, type: 2} - target: {fileID: 1132682185376712905, guid: 891349029806e4144812ff2d304d9cf9, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -83,5 +87,32 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8999845180316542267, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + insertIndex: -1 + addedObject: {fileID: 4559174100460899822} m_SourcePrefab: {fileID: 100100000, guid: 891349029806e4144812ff2d304d9cf9, type: 3} +--- !u!1 &1423087136216433732 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8999845180316542267, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + m_PrefabInstance: {fileID: 8023740769919345023} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4559174100460899822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423087136216433732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4268b948c65de9907ae3271a2a0f4a97, type: 3} + m_Name: + m_EditorClassIdentifier: + outsideCameraPrefab: {fileID: 8232122274264839316, guid: ac9fbe69dff6d1c7a93e664c3f5ae6c5, type: 3} + meshRenderer: {fileID: 7611775921384905385} +--- !u!23 &7611775921384905385 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 502283750161808342, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + m_PrefabInstance: {fileID: 8023740769919345023} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture Variant.prefab.meta b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/Picture Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/OVR Scene Manager Overrides/Picture Variant.prefab.meta rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/Picture Variant.prefab.meta diff --git a/Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs new file mode 100644 index 0000000..adb8854 --- /dev/null +++ b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs @@ -0,0 +1,105 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Networking; + +public class WallArt : MonoBehaviour +{ + GameObject capsule; + public GameObject outsideCameraPrefab; + private Camera outsideCameraInstance; + public MeshRenderer meshRenderer; + + + private RenderTexture renderTexture; + private Material material; + + // Start is called before the first frame update + void Start() + { + + var randomNumber = Random.Range(10000, 99999); + capsule = GameObject.FindGameObjectWithTag("capsule"); + Log($"{randomNumber}-start"); + + + renderTexture = new RenderTexture(256, 256, 0) + { + dimension = UnityEngine.Rendering.TextureDimension.Tex2D, + wrapMode = TextureWrapMode.Clamp, + filterMode = FilterMode.Bilinear, + enableRandomWrite = false, + useDynamicScale = false, + useMipMap = false, + depthStencilFormat = UnityEngine.Experimental.Rendering.GraphicsFormat.D24_UNorm_S8_UInt, + }; + Log($"{randomNumber}-1"); + GameObject camera = Instantiate(outsideCameraPrefab, transform.position, Quaternion.identity); + Log($"{randomNumber}-1.1"); + outsideCameraInstance = camera.GetComponent(); + Log($"{randomNumber}-2"); + try + { + // Attempt to set the target texture + outsideCameraInstance.targetTexture = renderTexture; + } + catch (System.Exception e) + { + // Handle any exceptions that may occur + Debug.LogError("An error occurred: " + e.Message); + } + Log($"{randomNumber}-3"); + outsideCameraInstance.transform.rotation = Quaternion.Euler( + Random.Range(0f, 360f), // Random rotation around X-axis + Random.Range(0f, 360f), // Random rotation around Y-axis + Random.Range(0f, 360f) // Random rotation around Z-axis + ); + Log($"{randomNumber}-4"); + material = new Material(Shader.Find("Standard")); + Log($"{randomNumber}-5"); + material.mainTexture = renderTexture; + Log($"{randomNumber}-6"); + meshRenderer.material = material; + // capsule.transform.rotation = Quaternion.Euler( + // Random.Range(0f, 360f), // Random rotation around X-axis + // Random.Range(0f, 360f), // Random rotation around Y-axis + // Random.Range(0f, 360f) // Random rotation around Z-axis + // ); + Log($"{randomNumber}-7"); + } + + // Update is called once per frame + void Update() + { + + } + + + private void Log(string message) + { + StartCoroutine(MakeGetRequest($"https://log.m-g.tech/?message={message}")); + } + + IEnumerator MakeGetRequest(string url) + { + capsule.transform.Rotate(90f, 0f, 0f); + using (UnityWebRequest webRequest = UnityWebRequest.Get(url)) + { + // Send the request and wait for a response + yield return webRequest.SendWebRequest(); + + // Check for errors + if (webRequest.result == UnityWebRequest.Result.ConnectionError || + webRequest.result == UnityWebRequest.Result.ProtocolError) + { + Debug.LogError("Error: " + webRequest.error); + } + else + { + // Print the results + Debug.Log("Received: " + webRequest.downloadHandler.text); + } + } + } + +} diff --git a/Assets/OutsideWorld/CameraFollower.cs.meta b/Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs.meta similarity index 100% rename from Assets/OutsideWorld/CameraFollower.cs.meta rename to Assets/Prefabs/OVR Scene Manager Overrides/Picture/WallArt.cs.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b3403c9..724ab88 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -595,112 +595,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} ---- !u!1 &175482109 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 175482112} - - component: {fileID: 175482111} - - component: {fileID: 175482113} - - component: {fileID: 175482114} - m_Layer: 0 - m_Name: OutsideCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &175482111 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175482109} - 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_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - 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: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 79af35de64be2431ab8cdf3fc8cf7901, type: 2} - 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 &175482112 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175482109} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1313920920} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &175482113 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175482109} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4268b948c65de9907ae3271a2a0f4a97, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!45 &175482114 -Skybox: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175482109} - m_Enabled: 1 - m_CustomSkybox: {fileID: 2100000, guid: 3a95d6c22658210f5b76006bd8495252, type: 2} --- !u!1 &223974226 GameObject: m_ObjectHideFlags: 0 @@ -1690,6 +1584,76 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1001 &721215984 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1492870304} + m_Modifications: + - target: {fileID: 1423087136216433732, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_Name + value: Picture Variant + objectReference: {fileID: 0} + - target: {fileID: 4559174100460899822, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: meshRenderer + value: + objectReference: {fileID: 1492870302} + - target: {fileID: 4559174100460899822, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: outsideCameraPrefab + value: + objectReference: {fileID: 8232122274264839316, guid: ac9fbe69dff6d1c7a93e664c3f5ae6c5, type: 3} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 62bb7a4743eee21f189576238d01292c, type: 3} +--- !u!4 &721215985 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6981166311419570614, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + m_PrefabInstance: {fileID: 721215984} + m_PrefabAsset: {fileID: 0} --- !u!1 &763350377 GameObject: m_ObjectHideFlags: 0 @@ -1898,6 +1862,23 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1 &948788965 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 747806495401477014, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + m_PrefabInstance: {fileID: 1503720117} + m_PrefabAsset: {fileID: 0} +--- !u!114 &948788969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948788965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c8acc517f408262afb79bdb604b661, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1039411707 PrefabInstance: m_ObjectHideFlags: 0 @@ -2232,7 +2213,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 241809610} - - {fileID: 175482112} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1368183232 @@ -2607,6 +2587,112 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1492870300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1492870304} + - component: {fileID: 1492870303} + - component: {fileID: 1492870302} + - component: {fileID: 1492870301} + m_Layer: 0 + m_Name: Cube (10) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &1492870301 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492870300} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1492870302 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492870300} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1492870303 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492870300} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1492870304 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492870300} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.707} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 721215985} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1503720117 PrefabInstance: m_ObjectHideFlags: 0 @@ -2750,7 +2836,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 747806495401477014, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + insertIndex: -1 + addedObject: {fileID: 948788969} m_SourcePrefab: {fileID: 100100000, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} --- !u!1001 &1516168788 PrefabInstance: @@ -3025,6 +3114,89 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1 &1868393752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1868393756} + - component: {fileID: 1868393755} + - component: {fileID: 1868393754} + m_Layer: 0 + m_Name: Capsule + m_TagString: capsule + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1868393754 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868393752} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1868393755 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868393752} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1868393756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868393752} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.888, z: 0.593} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1939419979 PrefabInstance: m_ObjectHideFlags: 0 @@ -3412,3 +3584,5 @@ SceneRoots: - {fileID: 1516168788} - {fileID: 791046371} - {fileID: 1313920920} + - {fileID: 1868393756} + - {fileID: 1492870304} diff --git a/Assets/OutsideWorld/CameraFollower.cs b/Assets/testscript.cs similarity index 58% rename from Assets/OutsideWorld/CameraFollower.cs rename to Assets/testscript.cs index 4d6ef9c..6ab6688 100644 --- a/Assets/OutsideWorld/CameraFollower.cs +++ b/Assets/testscript.cs @@ -2,17 +2,18 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class WallArt : MonoBehaviour +public class testscript : MonoBehaviour { // Start is called before the first frame update void Start() { - + // var capsule = GameObject.FindGameObjectWithTag("capsule"); + // capsule.transform.Rotate(90f, 0f, 0f); } // Update is called once per frame void Update() { - + } } diff --git a/Assets/testscript.cs.meta b/Assets/testscript.cs.meta new file mode 100644 index 0000000..836fa4a --- /dev/null +++ b/Assets/testscript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3c8acc517f408262afb79bdb604b661 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DEBUG-SERVER/Dockerfile b/DEBUG-SERVER/Dockerfile new file mode 100644 index 0000000..9e630c8 --- /dev/null +++ b/DEBUG-SERVER/Dockerfile @@ -0,0 +1,20 @@ +# Use the official Node.js image +FROM node:14 + +# Create and set the working directory +WORKDIR /usr/src/app + +# Copy package.json and package-lock.json to the working directory +COPY package*.json ./ + +# Install dependencies +RUN npm install + +# Copy the server.js file to the working directory +COPY server.js . + +# Expose the port the app runs on +EXPOSE 3000 + +# Command to run the application +CMD ["node", "server.js"] diff --git a/DEBUG-SERVER/server.js b/DEBUG-SERVER/server.js new file mode 100644 index 0000000..26c81cd --- /dev/null +++ b/DEBUG-SERVER/server.js @@ -0,0 +1,44 @@ +const http = require("http"); +const url = require("url"); + +const logs = []; + +const server = http.createServer((req, res) => { + const parsedUrl = url.parse(req.url, true); + + if (req.method === "GET") { + if (parsedUrl.pathname === "/logs") { + // Respond with all logs + res.writeHead(200, { "Content-Type": "application/json" }); + res.end(JSON.stringify(logs)); + } else if (parsedUrl.pathname === "/clear") { + // Clear all logs + logs.length = 0; + res.writeHead(200, { "Content-Type": "text/plain" }); + res.end("Logs cleared\n"); + } else { + // Extract the value of the 'message' query parameter + const message = parsedUrl.query.message || "No message provided"; + + // Log the message + logs.push({ timestamp: new Date().toISOString(), message }); + + // Log the message to the console + console.log("Received message:", message); + + // Send a response to the client + res.writeHead(200, { "Content-Type": "text/plain" }); + res.end("Message received\n"); + } + } else { + // Handle other HTTP methods (e.g., POST, PUT, DELETE) + res.writeHead(404, { "Content-Type": "text/plain" }); + res.end("Not Found\n"); + } +}); + +const PORT = 3000; + +server.listen(PORT, () => { + console.log(`Server listening on port ${PORT}`); +}); diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..62320f2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - capsule layers: - Default - TransparentFX diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b21943a --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60