m-vz/modular-vr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hoop light, improve desert texture tiling performance

Browse Source
This commit is contained in:
milan
2022-12-05 13:10:00 +01:00
parent b5a050427b
commit 5449283e5d
24 changed files with 108 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Desert/Assets/Materials/Desert Floor.mat
View File

@@ -103,7 +103,7 @@ Material:
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _Parallax: 0.025
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 1

5
Assets/Desert/Assets/Materials/Hoop.mat
View File

@@ -25,12 +25,11 @@ Material:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
- _METALLICSPECGLOSSMAP
- _NORMALMAP
- _OCCLUSIONMAP
m_InvalidKeywords: []
m_LightmapFlags: 2
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@@ -131,6 +130,6 @@ Material:
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 8, g: 3.5137255, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

BIN
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png (Stored with Git LFS)
View File

Binary file not shown.

5
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_AlbedoTransparency.png.meta
View File

@@ -20,6 +20,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
@@ -33,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0
@@ -63,6 +64,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
@@ -117,7 +119,6 @@ TextureImporter:
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png (Stored with Git LFS)
View File

Binary file not shown.

5
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Height.png.meta
View File

@@ -20,6 +20,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
@@ -33,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0
@@ -63,6 +64,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
@@ -117,7 +119,6 @@ TextureImporter:
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png (Stored with Git LFS)
View File

Binary file not shown.

2
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_MetallicSmoothness.png.meta
View File

@@ -34,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0

BIN
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png (Stored with Git LFS)
View File

Binary file not shown.

5
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Normal.png.meta
View File

@@ -20,6 +20,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
@@ -33,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0
@@ -63,6 +64,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
@@ -117,7 +119,6 @@ TextureImporter:
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png (Stored with Git LFS)
View File

Binary file not shown.

123
Assets/Desert/Assets/Materials/Textures/Desert Floor/Desert Floor_DefaultMaterial_Occlusion.png.meta
View File

@@ -1,123 +0,0 @@
fileFormatVersion: 2
guid: 1c44f0647a1aa074db182a63ccb0b749
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Desert/Assets/Models/Desert Floor.blend (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/Desert/Assets/Models/Desert Floor.blend1
View File

Binary file not shown.

BIN
Assets/Desert/Assets/Models/Desert Floor.fbx (Stored with Git LFS)
View File

Binary file not shown.

2
Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop Fling.asset
View File

@@ -19,3 +19,5 @@ MonoBehaviour:
- {fileID: 11400000, guid: 2393bf2b32e06f647a014688e3d8a8d9, type: 2}
placementRequirements:
- {fileID: 11400000, guid: be3144e12a689e84fbfe2ce50f61dcc7, type: 2}
puzzleName: Hoop Fling
puzzleVersion: 1

2
Assets/Desert/Assets/Prefabs/Puzzle D.prefab → Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab
View File

@@ -198,7 +198,7 @@ GameObject:
- component: {fileID: 7796001094996554276}
- component: {fileID: 6853723365353446933}
m_Layer: 0
m_Name: Puzzle D
m_Name: Hoop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
Assets/Desert/Assets/Prefabs/Puzzle D.prefab.meta → Assets/Desert/Assets/Modules/Hoop Fling Puzzle/Hoop.prefab.meta
View File

97
Assets/Desert/Assets/Prefabs/Desert Environment.prefab
View File

@@ -9,7 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7626240558108670521}
- component: {fileID: 358226908976233590}
m_Layer: 0
m_Name: Desert Environment
m_TagString: Untagged
@@ -33,22 +32,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &358226908976233590
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5743657079028767629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1d4fe6d2e6d5cac42aed108734e128f7, type: 3}
m_Name:
m_EditorClassIdentifier:
floor: {fileID: 100443119660398373, guid: cc21a746bc450c74b8ecfc78f142849a, type: 3}
floorParent: {fileID: 895589781461088420}
tileSize: {x: 100, y: 100}
tileCount: {x: 9, y: 9}
--- !u!1 &7280908611734617658
GameObject:
m_ObjectHideFlags: 0
@@ -76,7 +59,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Children:
- {fileID: 574765980742794756}
m_Father: {fileID: 7933998900790106032}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -112,3 +96,80 @@ Transform:
m_Father: {fileID: 7626240558108670521}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2434868707875363028
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 2
m_TransformParent: {fileID: 895589781461088420}
m_Modifications:
- target: {fileID: 100443119660398373, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_Name
value: Desert Floor Tile
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_AddedGameObjects: []
m_SourcePrefab: {fileID: 100100000, guid: cc21a746bc450c74b8ecfc78f142849a, type: 3}
--- !u!4 &574765980742794756 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
type: 3}
m_PrefabInstance: {fileID: 2434868707875363028}
m_PrefabAsset: {fileID: 0}

31
Assets/Desert/Runtime/DesertFloor.cs
View File

@@ -1,31 +0,0 @@
using NaughtyAttributes;
using UnityEditor;
using UnityEngine;
namespace EscapeRoomEngine.Desert.Runtime
{
public class DesertFloor : MonoBehaviour
{
[Required] public GameObject floor;
[Required] public Transform floorParent;
public Vector2 tileSize;
public Vector2Int tileCount;
private void Start()
{
for (var z = -tileCount.y; z <= tileCount.y; z++)
{
for (var x = -tileCount.x; x <= tileCount.x; x++)
{
var f = Instantiate(floor, floorParent);
f.transform.localPosition = new Vector3(x * tileSize.x, 0, z * tileSize.y);
f.isStatic = true;
}
}
#if UNITY_EDITOR
SceneVisibilityManager.instance.DisablePicking(floorParent.gameObject, true);
#endif
}
}
}

11
Assets/Desert/Runtime/DesertFloor.cs.meta
View File

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