From 1f36f3e1a40e9f69fc1beec2d39269aba639784a Mon Sep 17 00:00:00 2001 From: excitedneon Date: Fri, 12 May 2017 00:34:56 +0300 Subject: [PATCH] Add a hologram model and make the screen a hologram --- Assets/Models.meta | 9 + Assets/Models/Hologram.blend | 3 + Assets/Models/Hologram.blend.meta | 84 +++++++ Assets/{ => Models}/Materials.meta | 0 Assets/Models/Materials/Hologram.mat | 78 +++++++ Assets/Models/Materials/Hologram.mat.meta | 9 + Assets/Models/Materials/Hologram.meta | 9 + Assets/Models/Materials/Hologram_Base.mat | 78 +++++++ .../Models/Materials/Hologram_Base.mat.meta | 9 + Assets/Models/Materials/Hologram_Edge.mat | 78 +++++++ .../Models/Materials/Hologram_Edge.mat.meta | 9 + Assets/{ => Models}/Materials/Lamp.mat | 0 Assets/{ => Models}/Materials/Lamp.mat.meta | 0 Assets/Models/Materials/Screen.mat | 77 +++++++ Assets/Models/Materials/Screen.mat.meta | 9 + Assets/{ => Models}/Materials/Testing.meta | 0 .../Materials/Testing/TestBlue.mat | 0 .../Materials/Testing/TestBlue.mat.meta | 0 .../Materials/Testing/TestGreen.mat | 0 .../Materials/Testing/TestGreen.mat.meta | 0 .../Materials/Testing/TestPink.mat | 0 .../Materials/Testing/TestPink.mat.meta | 0 .../Materials/Testing/TestRed.mat | 0 .../Materials/Testing/TestRed.mat.meta | 0 .../Materials/Testing/TestYellow.mat | 0 .../Materials/Testing/TestYellow.mat.meta | 0 Assets/Models/Textures.meta | 9 + .../GradientVerticalWhiteToTransparent.png | 3 + ...radientVerticalWhiteToTransparent.png.meta | 68 ++++++ Assets/Models/Textures/TransparentTexture.png | 3 + .../Textures/TransparentTexture.png.meta | 68 ++++++ Assets/PostProcessingProfiles/DefaultPP.asset | 10 +- Assets/Scenes/TestMap.unity | 214 ++++++++++++++---- Assets/Scripts/Entities/SyncBases/Computer.cs | 18 ++ 34 files changed, 792 insertions(+), 53 deletions(-) create mode 100644 Assets/Models.meta create mode 100644 Assets/Models/Hologram.blend create mode 100644 Assets/Models/Hologram.blend.meta rename Assets/{ => Models}/Materials.meta (100%) create mode 100644 Assets/Models/Materials/Hologram.mat create mode 100644 Assets/Models/Materials/Hologram.mat.meta create mode 100644 Assets/Models/Materials/Hologram.meta create mode 100644 Assets/Models/Materials/Hologram_Base.mat create mode 100644 Assets/Models/Materials/Hologram_Base.mat.meta create mode 100644 Assets/Models/Materials/Hologram_Edge.mat create mode 100644 Assets/Models/Materials/Hologram_Edge.mat.meta rename Assets/{ => Models}/Materials/Lamp.mat (100%) rename Assets/{ => Models}/Materials/Lamp.mat.meta (100%) create mode 100644 Assets/Models/Materials/Screen.mat create mode 100644 Assets/Models/Materials/Screen.mat.meta rename Assets/{ => Models}/Materials/Testing.meta (100%) rename Assets/{ => Models}/Materials/Testing/TestBlue.mat (100%) rename Assets/{ => Models}/Materials/Testing/TestBlue.mat.meta (100%) rename Assets/{ => Models}/Materials/Testing/TestGreen.mat (100%) rename Assets/{ => Models}/Materials/Testing/TestGreen.mat.meta (100%) rename Assets/{ => Models}/Materials/Testing/TestPink.mat (100%) rename Assets/{ => Models}/Materials/Testing/TestPink.mat.meta (100%) rename Assets/{ => Models}/Materials/Testing/TestRed.mat (100%) rename Assets/{ => Models}/Materials/Testing/TestRed.mat.meta (100%) rename Assets/{ => Models}/Materials/Testing/TestYellow.mat (100%) rename Assets/{ => Models}/Materials/Testing/TestYellow.mat.meta (100%) create mode 100644 Assets/Models/Textures.meta create mode 100644 Assets/Models/Textures/GradientVerticalWhiteToTransparent.png create mode 100644 Assets/Models/Textures/GradientVerticalWhiteToTransparent.png.meta create mode 100644 Assets/Models/Textures/TransparentTexture.png create mode 100644 Assets/Models/Textures/TransparentTexture.png.meta diff --git a/Assets/Models.meta b/Assets/Models.meta new file mode 100644 index 0000000..6505ad5 --- /dev/null +++ b/Assets/Models.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e3b034edf0f2241f284f12f2548b89ee +folderAsset: yes +timeCreated: 1494533755 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Hologram.blend b/Assets/Models/Hologram.blend new file mode 100644 index 0000000..5c53d2b --- /dev/null +++ b/Assets/Models/Hologram.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66f64f3c8b0551b36bad4a5a647851e3541c7e9b212d3fd3628a7a5829e8a391 +size 523148 diff --git a/Assets/Models/Hologram.blend.meta b/Assets/Models/Hologram.blend.meta new file mode 100644 index 0000000..5875095 --- /dev/null +++ b/Assets/Models/Hologram.blend.meta @@ -0,0 +1,84 @@ +fileFormatVersion: 2 +guid: fc26c95dfc47945d5b323d895acc1d06 +timeCreated: 1494534234 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Hologram + 7400000: Default Take + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 1 + materialSearch: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials.meta b/Assets/Models/Materials.meta similarity index 100% rename from Assets/Materials.meta rename to Assets/Models/Materials.meta diff --git a/Assets/Models/Materials/Hologram.mat b/Assets/Models/Materials/Hologram.mat new file mode 100644 index 0000000..846be74 --- /dev/null +++ b/Assets/Models/Materials/Hologram.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Hologram + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + 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: 0} + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0.16600001, b: 0.97699326, a: 0.278} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.15686275} diff --git a/Assets/Models/Materials/Hologram.mat.meta b/Assets/Models/Materials/Hologram.mat.meta new file mode 100644 index 0000000..200f791 --- /dev/null +++ b/Assets/Models/Materials/Hologram.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cc4c08d204a79447484ac0feba2a009b +timeCreated: 1494534721 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Hologram.meta b/Assets/Models/Materials/Hologram.meta new file mode 100644 index 0000000..71d1c1b --- /dev/null +++ b/Assets/Models/Materials/Hologram.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8a08f041ba005426aadcc713748f9ba0 +folderAsset: yes +timeCreated: 1494537772 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Hologram_Base.mat b/Assets/Models/Materials/Hologram_Base.mat new file mode 100644 index 0000000..123bb31 --- /dev/null +++ b/Assets/Models/Materials/Hologram_Base.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Hologram_Base + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + 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: 2800000, guid: 6233f8e61d72f4dfc84e16694a7c6a75, type: 3} + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0.16600001, b: 0.97699326, a: 0.278} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.15686275} diff --git a/Assets/Models/Materials/Hologram_Base.mat.meta b/Assets/Models/Materials/Hologram_Base.mat.meta new file mode 100644 index 0000000..6672ba6 --- /dev/null +++ b/Assets/Models/Materials/Hologram_Base.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d0e06f49f789848479496513ddc9d4a6 +timeCreated: 1494534721 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Hologram_Edge.mat b/Assets/Models/Materials/Hologram_Edge.mat new file mode 100644 index 0000000..87117d2 --- /dev/null +++ b/Assets/Models/Materials/Hologram_Edge.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Hologram_Edge + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + 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: 0} + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0.24316895, g: 0.17925, b: 0.25, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.19607843} diff --git a/Assets/Models/Materials/Hologram_Edge.mat.meta b/Assets/Models/Materials/Hologram_Edge.mat.meta new file mode 100644 index 0000000..6ad09d6 --- /dev/null +++ b/Assets/Models/Materials/Hologram_Edge.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0512e7921046d4372ac4b499027cfca4 +timeCreated: 1494537207 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Lamp.mat b/Assets/Models/Materials/Lamp.mat similarity index 100% rename from Assets/Materials/Lamp.mat rename to Assets/Models/Materials/Lamp.mat diff --git a/Assets/Materials/Lamp.mat.meta b/Assets/Models/Materials/Lamp.mat.meta similarity index 100% rename from Assets/Materials/Lamp.mat.meta rename to Assets/Models/Materials/Lamp.mat.meta diff --git a/Assets/Models/Materials/Screen.mat b/Assets/Models/Materials/Screen.mat new file mode 100644 index 0000000..e3730a6 --- /dev/null +++ b/Assets/Models/Materials/Screen.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Screen + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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: 2800000, guid: 328c2c4d7e4d149aba3285d3bed75ad9, type: 3} + 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_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 0.9866668, g: 0.8039216, b: 1, a: 0.3137255} diff --git a/Assets/Models/Materials/Screen.mat.meta b/Assets/Models/Materials/Screen.mat.meta new file mode 100644 index 0000000..82d4a99 --- /dev/null +++ b/Assets/Models/Materials/Screen.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: bc07ff2ef266a4661adc506da3430c31 +timeCreated: 1494536123 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Testing.meta b/Assets/Models/Materials/Testing.meta similarity index 100% rename from Assets/Materials/Testing.meta rename to Assets/Models/Materials/Testing.meta diff --git a/Assets/Materials/Testing/TestBlue.mat b/Assets/Models/Materials/Testing/TestBlue.mat similarity index 100% rename from Assets/Materials/Testing/TestBlue.mat rename to Assets/Models/Materials/Testing/TestBlue.mat diff --git a/Assets/Materials/Testing/TestBlue.mat.meta b/Assets/Models/Materials/Testing/TestBlue.mat.meta similarity index 100% rename from Assets/Materials/Testing/TestBlue.mat.meta rename to Assets/Models/Materials/Testing/TestBlue.mat.meta diff --git a/Assets/Materials/Testing/TestGreen.mat b/Assets/Models/Materials/Testing/TestGreen.mat similarity index 100% rename from Assets/Materials/Testing/TestGreen.mat rename to Assets/Models/Materials/Testing/TestGreen.mat diff --git a/Assets/Materials/Testing/TestGreen.mat.meta b/Assets/Models/Materials/Testing/TestGreen.mat.meta similarity index 100% rename from Assets/Materials/Testing/TestGreen.mat.meta rename to Assets/Models/Materials/Testing/TestGreen.mat.meta diff --git a/Assets/Materials/Testing/TestPink.mat b/Assets/Models/Materials/Testing/TestPink.mat similarity index 100% rename from Assets/Materials/Testing/TestPink.mat rename to Assets/Models/Materials/Testing/TestPink.mat diff --git a/Assets/Materials/Testing/TestPink.mat.meta b/Assets/Models/Materials/Testing/TestPink.mat.meta similarity index 100% rename from Assets/Materials/Testing/TestPink.mat.meta rename to Assets/Models/Materials/Testing/TestPink.mat.meta diff --git a/Assets/Materials/Testing/TestRed.mat b/Assets/Models/Materials/Testing/TestRed.mat similarity index 100% rename from Assets/Materials/Testing/TestRed.mat rename to Assets/Models/Materials/Testing/TestRed.mat diff --git a/Assets/Materials/Testing/TestRed.mat.meta b/Assets/Models/Materials/Testing/TestRed.mat.meta similarity index 100% rename from Assets/Materials/Testing/TestRed.mat.meta rename to Assets/Models/Materials/Testing/TestRed.mat.meta diff --git a/Assets/Materials/Testing/TestYellow.mat b/Assets/Models/Materials/Testing/TestYellow.mat similarity index 100% rename from Assets/Materials/Testing/TestYellow.mat rename to Assets/Models/Materials/Testing/TestYellow.mat diff --git a/Assets/Materials/Testing/TestYellow.mat.meta b/Assets/Models/Materials/Testing/TestYellow.mat.meta similarity index 100% rename from Assets/Materials/Testing/TestYellow.mat.meta rename to Assets/Models/Materials/Testing/TestYellow.mat.meta diff --git a/Assets/Models/Textures.meta b/Assets/Models/Textures.meta new file mode 100644 index 0000000..8f7343c --- /dev/null +++ b/Assets/Models/Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1263a9b56c2904932a87cf72ee19bf84 +folderAsset: yes +timeCreated: 1494533762 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png b/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png new file mode 100644 index 0000000..e7fe368 --- /dev/null +++ b/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a49ca2e426d1fee8053ef93d08bf0ca7dbe9fd836212aef581ba3d563091f5 +size 170327 diff --git a/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png.meta b/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png.meta new file mode 100644 index 0000000..2dd5cb3 --- /dev/null +++ b/Assets/Models/Textures/GradientVerticalWhiteToTransparent.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 6233f8e61d72f4dfc84e16694a7c6a75 +timeCreated: 1494535028 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Textures/TransparentTexture.png b/Assets/Models/Textures/TransparentTexture.png new file mode 100644 index 0000000..01cf4a3 --- /dev/null +++ b/Assets/Models/Textures/TransparentTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdb8ae41ac9ddb15a3a8c01f2148b05329e4163c0f986791477a34c1606f339c +size 151 diff --git a/Assets/Models/Textures/TransparentTexture.png.meta b/Assets/Models/Textures/TransparentTexture.png.meta new file mode 100644 index 0000000..0a5dc3b --- /dev/null +++ b/Assets/Models/Textures/TransparentTexture.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 328c2c4d7e4d149aba3285d3bed75ad9 +timeCreated: 1494536162 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PostProcessingProfiles/DefaultPP.asset b/Assets/PostProcessingProfiles/DefaultPP.asset index 9ba9be5..faebc1e 100644 --- a/Assets/PostProcessingProfiles/DefaultPP.asset +++ b/Assets/PostProcessingProfiles/DefaultPP.asset @@ -100,14 +100,14 @@ MonoBehaviour: m_Enabled: 1 m_Settings: bloom: - intensity: 1 - threshold: 1.4 + intensity: 0.5 + threshold: 1.3 softKnee: 0.5 radius: 5 - antiFlicker: 1 + antiFlicker: 0 lensDirt: - texture: {fileID: 0} - intensity: 3 + texture: {fileID: 2800000, guid: a2960ffde020f27409e070d92fb2e00b, type: 3} + intensity: 0.75 colorGrading: m_Enabled: 0 m_Settings: diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index fdb2865..904abd7 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -938,6 +938,88 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d715320baa1f401ab0f46b603399dc3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &746314094 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 746314095} + - component: {fileID: 746314098} + - component: {fileID: 746314097} + - component: {fileID: 746314096} + m_Layer: 0 + m_Name: Projector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &746314095 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 746314094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.45, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.2} + m_Children: [] + m_Father: {fileID: 784099997} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &746314096 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 746314094} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: d7fc3e4b5927d4025acc0b692587440c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + 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 +--- !u!65 &746314097 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 746314094} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &746314098 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 746314094} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &769207964 GameObject: m_ObjectHideFlags: 0 @@ -1035,9 +1117,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 784099997} - - component: {fileID: 784099996} - component: {fileID: 784099995} - - component: {fileID: 784099994} - component: {fileID: 784099993} - component: {fileID: 784099998} m_Layer: 0 @@ -1064,42 +1144,10 @@ MonoBehaviour: FontSize: 32 Width: 256 Height: 256 - Mesh: {fileID: 784099994} - MaterialIndex: 0 - Emissive: 1 + Mesh: {fileID: 1539986579} + MaterialIndex: 3 + Emissive: 0 Brightness: 1 ---- !u!23 &784099994 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 784099992} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 82a7d1c3c9154445794eb04c29ab2bd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!65 &784099995 BoxCollider: m_ObjectHideFlags: 0 @@ -1110,15 +1158,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &784099996 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 784099992} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_Size: {x: 0.2, y: 1.3, z: 1} + m_Center: {x: 0, y: 0.15, z: 0} --- !u!4 &784099997 Transform: m_ObjectHideFlags: 0 @@ -1127,8 +1168,10 @@ Transform: m_GameObject: {fileID: 784099992} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3, y: 1.5, z: 0} - m_LocalScale: {x: 0.05, y: 1, z: 1} - m_Children: [] + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1539986578} + - {fileID: 746314095} m_Father: {fileID: 949094013} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1145,6 +1188,7 @@ MonoBehaviour: m_EditorClassIdentifier: ID: 0 Screen: {fileID: 784099993} + Hologram: {fileID: 1539986578} KeyLeft: {fileID: 1848764882} KeyRight: {fileID: 1999224091} --- !u!1 &792995699 @@ -1952,6 +1996,11 @@ Prefab: propertyPath: WillTrigger value: objectReference: {fileID: 310461193} + - target: {fileID: 114327153796435004, guid: 660bef6a67fed4941b963e96ff20a5e0, + type: 2} + propertyPath: BlinkBrightness + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 660bef6a67fed4941b963e96ff20a5e0, type: 2} m_IsPrefabParent: 0 @@ -2031,6 +2080,65 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1539986577 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 784099997} + m_Modifications: + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5000007 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalRotation.y + value: -0.49999928 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalRotation.z + value: -0.49999928 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5000007 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90.00001 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90.00001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + m_IsPrefabParent: 0 +--- !u!4 &1539986578 stripped +Transform: + m_PrefabParentObject: {fileID: 400000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} + m_PrefabInternal: {fileID: 1539986577} +--- !u!23 &1539986579 stripped +MeshRenderer: + m_PrefabParentObject: {fileID: 2300000, guid: fc26c95dfc47945d5b323d895acc1d06, + type: 3} + m_PrefabInternal: {fileID: 1539986577} --- !u!1 &1610252928 GameObject: m_ObjectHideFlags: 0 @@ -2374,6 +2482,11 @@ Prefab: propertyPath: m_Name value: Button Left objectReference: {fileID: 0} + - target: {fileID: 114327153796435004, guid: 660bef6a67fed4941b963e96ff20a5e0, + type: 2} + propertyPath: BlinkBrightness + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 660bef6a67fed4941b963e96ff20a5e0, type: 2} m_IsPrefabParent: 0 @@ -2485,6 +2598,11 @@ Prefab: propertyPath: m_Name value: Button Right objectReference: {fileID: 0} + - target: {fileID: 114327153796435004, guid: 660bef6a67fed4941b963e96ff20a5e0, + type: 2} + propertyPath: BlinkBrightness + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 660bef6a67fed4941b963e96ff20a5e0, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Entities/SyncBases/Computer.cs b/Assets/Scripts/Entities/SyncBases/Computer.cs index 5feec4c..55b632b 100644 --- a/Assets/Scripts/Entities/SyncBases/Computer.cs +++ b/Assets/Scripts/Entities/SyncBases/Computer.cs @@ -26,6 +26,12 @@ namespace Cyber.Entities.SyncBases { /// public TextTextureApplier Screen; + /// + /// If the computer has a hologram as a screen, and is set here, the + /// hologram will be animated properly when the computer is shut down. + /// + public Transform Hologram; + /// /// The "left" key for this computer. Might cause actions depending /// on the program. @@ -44,6 +50,8 @@ namespace Cyber.Entities.SyncBases { /// public RunProgram Program; + private bool ComputerOn = true; + /// /// Runs the with some input, determined by the /// Trigger. @@ -51,12 +59,14 @@ namespace Cyber.Entities.SyncBases { /// Determines the keycode given to the /// . public override void Interact(SyncBase Trigger) { + ComputerOn = true; if (Trigger == KeyLeft) { Screen.SetTextProperties(new TextTextureProperties("\n Pressed left!")); } else if (Trigger == KeyRight) { Screen.SetTextProperties(new TextTextureProperties("\n Pressed right!")); } else { Screen.SetTextProperties(new TextTextureProperties("")); + ComputerOn = false; } } @@ -93,5 +103,13 @@ namespace Cyber.Entities.SyncBases { public override InteractableSyncdata GetInteractableSyncdata() { return new InteractableSyncdata(true, true); } + + private void Update() { + if (Hologram != null) { + float Scale = ComputerOn ? 1 : 0; + Hologram.localScale = Vector3.Lerp(Hologram.localScale, + new Vector3(Scale, Scale, Scale), 8f * Time.deltaTime); + } + } } } \ No newline at end of file