diff --git a/Assets/materials/unnamed.mat b/Assets/materials/unnamed.mat index a8a0008..b63ccc5 100644 --- a/Assets/materials/unnamed.mat +++ b/Assets/materials/unnamed.mat @@ -36,13 +36,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - data: - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} data: first: name: _ParallaxMap @@ -78,6 +71,13 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + data: + first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: data: first: @@ -91,6 +91,10 @@ Material: first: name: _Cutoff second: .5 + data: + first: + name: _Parallax + second: .0419000015 data: first: name: _ZWrite @@ -98,19 +102,11 @@ Material: data: first: name: _Glossiness - second: .458999991 - data: - first: - name: _Metallic - second: .057 + second: .074000001 data: first: name: _BumpScale second: 1.10000002 - data: - first: - name: _Parallax - second: .0467999987 data: first: name: _OcclusionStrength @@ -127,6 +123,10 @@ Material: first: name: _Mode second: 0 + data: + first: + name: _Metallic + second: .0979999974 m_Colors: data: first: diff --git a/Assets/prefabs/RoomObject.obj b/Assets/prefabs/RoomObject.obj index cf56d4f..1205dbd 100644 --- a/Assets/prefabs/RoomObject.obj +++ b/Assets/prefabs/RoomObject.obj @@ -270,10 +270,10 @@ vt 0.005497 0.810803 vt 0.104897 0.505564 vt 0.408631 0.503644 vt 0.514794 0.810803 -vt 0.100673 0.505044 -vt 0.100673 0.152331 -vt 0.453387 0.152331 -vt 0.453387 0.505044 +vt 0.009173 0.511284 +vt 0.009173 0.015874 +vt 0.489080 0.015874 +vt 0.489080 0.511284 vn 0.000000 0.914300 0.404900 vn -0.404900 0.914300 0.000000 vn 0.404900 0.914300 0.000000 diff --git a/Assets/prefabs/basic_room.blend b/Assets/prefabs/basic_room.blend index 41be0af..09776c0 100644 Binary files a/Assets/prefabs/basic_room.blend and b/Assets/prefabs/basic_room.blend differ diff --git a/Assets/prefabs/basic_room.blend1 b/Assets/prefabs/basic_room.blend1 index a6ed7ae..b8b616e 100644 Binary files a/Assets/prefabs/basic_room.blend1 and b/Assets/prefabs/basic_room.blend1 differ diff --git a/Assets/scenes/GameplayScene.unity b/Assets/scenes/GameplayScene.unity index 403a9b6..9ce4dcc 100644 --- a/Assets/scenes/GameplayScene.unity +++ b/Assets/scenes/GameplayScene.unity @@ -2544,7 +2544,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 10833872, guid: 09a2e2e70f49c4330831bd4f733bbdb4, type: 2} propertyPath: m_Range - value: 252.96521 + value: 265.97876 objectReference: {fileID: 0} - target: {fileID: 169668, guid: 09a2e2e70f49c4330831bd4f733bbdb4, type: 2} propertyPath: m_Name @@ -2558,6 +2558,10 @@ Prefab: propertyPath: m_Name value: Spotlight_blue (right) objectReference: {fileID: 0} + - target: {fileID: 437796, guid: 09a2e2e70f49c4330831bd4f733bbdb4, type: 2} + propertyPath: m_LocalPosition.y + value: -2.32999992 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 09a2e2e70f49c4330831bd4f733bbdb4, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/textures/basic_room.png b/Assets/textures/basic_room.png index 472f35b..6a1b4cd 100644 Binary files a/Assets/textures/basic_room.png and b/Assets/textures/basic_room.png differ diff --git a/Assets/textures/basic_room_UVs.png b/Assets/textures/basic_room_UVs.png new file mode 100644 index 0000000..8982b13 Binary files /dev/null and b/Assets/textures/basic_room_UVs.png differ diff --git a/Assets/textures/basic_room_UVs.png.meta b/Assets/textures/basic_room_UVs.png.meta new file mode 100644 index 0000000..cea2229 --- /dev/null +++ b/Assets/textures/basic_room_UVs.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: ad527bcb58b6d4de381e12ab5d28382c +timeCreated: 1454255675 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/textures/basic_room_normal.png b/Assets/textures/basic_room_normal.png index ee32ddc..282d1a4 100644 Binary files a/Assets/textures/basic_room_normal.png and b/Assets/textures/basic_room_normal.png differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 5b7918f..940619b 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -14,7 +14,7 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -30,7 +30,7 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -46,7 +46,7 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -62,7 +62,7 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -78,7 +78,7 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -94,7 +94,7 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: 0.001 + dead: .00100000005 sensitivity: 3 snap: 1 invert: 0 @@ -110,7 +110,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 0 gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -126,7 +126,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 1 gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -142,7 +142,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 2 gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -158,7 +158,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -175,7 +175,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: 0.1 + sensitivity: .100000001 snap: 0 invert: 0 type: 1 @@ -191,7 +191,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: 0.1 + sensitivity: .100000001 snap: 0 invert: 0 type: 1 @@ -207,7 +207,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: 0.1 + sensitivity: .100000001 snap: 0 invert: 0 type: 1 @@ -217,12 +217,12 @@ InputManager: m_Name: Horizontal descriptiveName: descriptiveNegativeName: - negativeButton: - positiveButton: + negativeButton: a + positiveButton: d altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 0 @@ -238,7 +238,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 0 @@ -254,7 +254,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 0 @@ -265,12 +265,12 @@ InputManager: m_Name: Vertical descriptiveName: descriptiveNegativeName: - negativeButton: - positiveButton: + negativeButton: w + positiveButton: s altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 1 @@ -286,7 +286,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 1 @@ -302,7 +302,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: 0.19 + dead: .189999998 sensitivity: 1 snap: 0 invert: 1 @@ -318,7 +318,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -334,7 +334,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -350,7 +350,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -366,7 +366,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -382,7 +382,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 0 gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -398,7 +398,7 @@ InputManager: altNegativeButton: altPositiveButton: space gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0 @@ -414,7 +414,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 1 gravity: 1000 - dead: 0.001 + dead: .00100000005 sensitivity: 1000 snap: 0 invert: 0