From 147492927e003bb5baa441918f0cff22f8f9d6e7 Mon Sep 17 00:00:00 2001 From: raccoon Date: Wed, 18 Sep 2024 20:04:10 +0500 Subject: [PATCH] New room UV --- .../materials/dev_measuregeneric01b.mat | 2 +- Assets/measuregeneric/mesh/blend~/room.blend | 4 +- Assets/measuregeneric/mesh/fbx/room.fbx | 80 +++++++++---------- Assets/measuregeneric/mesh/fbx/room.fbx.meta | 4 +- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Assets/measuregeneric/materials/dev_measuregeneric01b.mat b/Assets/measuregeneric/materials/dev_measuregeneric01b.mat index 6b8a45e..374dcc7 100644 --- a/Assets/measuregeneric/materials/dev_measuregeneric01b.mat +++ b/Assets/measuregeneric/materials/dev_measuregeneric01b.mat @@ -45,7 +45,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 10fbd3b977317554fa742bcf9835995c, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 4, y: 4} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/measuregeneric/mesh/blend~/room.blend b/Assets/measuregeneric/mesh/blend~/room.blend index f04379b..8c7abea 100644 --- a/Assets/measuregeneric/mesh/blend~/room.blend +++ b/Assets/measuregeneric/mesh/blend~/room.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:142dbade26b793370c46ef31f5372d20b85b0f457890f8ea773d05a27ed4f006 -size 504816 +oid sha256:aa6d233c74698b0114831d1e4fe95e3bce8bbd911184c569bb067fa767ea3bd1 +size 535892 diff --git a/Assets/measuregeneric/mesh/fbx/room.fbx b/Assets/measuregeneric/mesh/fbx/room.fbx index f873fb9..7b84a61 100644 --- a/Assets/measuregeneric/mesh/fbx/room.fbx +++ b/Assets/measuregeneric/mesh/fbx/room.fbx @@ -9,11 +9,11 @@ FBXHeaderExtension: { CreationTimeStamp: { Version: 1000 Year: 2024 - Month: 08 - Day: 16 - Hour: 03 - Minute: 08 - Second: 36 + Month: 09 + Day: 18 + Hour: 19 + Minute: 59 + Second: 53 Millisecond: 0 } Creator: "FBX SDK/FBX Plugins build 20070228" @@ -21,7 +21,7 @@ FBXHeaderExtension: { FlagPLE: 0 } } -CreationTime: "2024-08-16 03:08:36:000" +CreationTime: "2024-09-18 19:59:53:000" Creator: "Blender version 2.79 (sub 0)" ; Object definitions @@ -154,8 +154,8 @@ Objects: { Name: "UVMap" MappingInformationType: "ByPolygonVertex" ReferenceInformationType: "IndexToDirect" - UV: 1.031250,0.125000,1.031250,0.000000,-0.031250,0.000000,-0.031250,0.125000 - UVIndex: 2,1,0,3 + UV: 1.312500,0.000000,-9.312500,0.000000,1.312500,1.250000,-9.312500,1.250000 + UVIndex: 1,0,2,3 } LayerElementTexture: 0 { Version: 101 @@ -287,8 +287,8 @@ Objects: { Name: "UVMap" MappingInformationType: "ByPolygonVertex" ReferenceInformationType: "IndexToDirect" - UV: 1.031250,0.125000,1.031250,0.000000,-0.031250,0.000000,-0.031250,0.125000 - UVIndex: 2,1,0,3 + UV: -0.312500,1.250000,10.312500,0.000000,-0.312500,0.000000,10.312500,1.250000 + UVIndex: 2,1,3,0 } LayerElementTexture: 0 { Version: 101 @@ -420,8 +420,8 @@ Objects: { Name: "UVMap" MappingInformationType: "ByPolygonVertex" ReferenceInformationType: "IndexToDirect" - UV: 1.031250,0.125000,1.031250,0.000000,-0.031250,0.000000,-0.031250,0.125000 - UVIndex: 2,1,0,3 + UV: 1.312500,0.000000,-9.312500,0.000000,1.312500,1.250000,-9.312500,1.250000 + UVIndex: 1,0,2,3 } LayerElementTexture: 0 { Version: 101 @@ -553,8 +553,8 @@ Objects: { Name: "UVMap" MappingInformationType: "ByPolygonVertex" ReferenceInformationType: "IndexToDirect" - UV: 1.031250,0.125000,1.031250,0.000000,-0.031250,0.000000,-0.031250,0.125000 - UVIndex: 2,1,0,3 + UV: -0.312500,1.250000,10.312500,0.000000,-0.312500,0.000000,10.312500,1.250000 + UVIndex: 2,1,3,0 } LayerElementTexture: 0 { Version: 101 @@ -686,8 +686,8 @@ Objects: { Name: "UVMap" MappingInformationType: "ByPolygonVertex" ReferenceInformationType: "IndexToDirect" - UV: -0.031250,1.031250,1.031250,-0.031250,-0.031250,-0.031250,1.031250,1.031250 - UVIndex: 2,1,3,0 + UV: 10.312500,-0.312500,-0.312500,-0.312500,-0.312500,10.312500,10.312500,10.312500 + UVIndex: 1,0,3,2 } LayerElementTexture: 0 { Version: 101 @@ -725,7 +725,7 @@ Objects: { } } } - Material: "Material::None__GridFloor_udon_png", "" { + Material: "Material::None__dev_measurewall01d_png", "" { Version: 102 ShadingModel: "phong" MultiLayer: 0 @@ -755,14 +755,14 @@ Objects: { Property: "Reflectivity", "double", "",0 } } - Video: "Video::GridFloor_udon_png", "Clip" { + Video: "Video::dev_measurewall01d_png", "Clip" { Type: "Clip" Properties60: { Property: "FrameRate", "double", "",0 Property: "LastFrame", "int", "",0 Property: "Width", "int", "",0 Property: "Height", "int", "",0 - Property: "Path", "charptr", "", "GridFloor_udon.png" + Property: "Path", "charptr", "", "dev_measurewall01d.png" Property: "StartFrame", "int", "",0 Property: "StopFrame", "int", "",0 Property: "PlaySpeed", "double", "",1 @@ -773,13 +773,13 @@ Objects: { Property: "AccessMode", "enum", "",0 } UseMipMap: 0 - Filename: "GridFloor_udon.png" - RelativeFilename: "C:\Users\raccoon\Workspace\Unity\VRChat\measuregeneric-world\Assets\measuregeneric\textures\GridFloor_udon.png" + Filename: "dev_measurewall01d.png" + RelativeFilename: "C:\Users\raccoon\Workspace\Unity\VRChat\measuregeneric-world\Assets\measuregeneric\textures\dev_measurewall01d.png" } - Texture: "Texture::GridFloor_udon_png", "TextureVideoClip" { + Texture: "Texture::dev_measurewall01d_png", "TextureVideoClip" { Type: "TextureVideoClip" Version: 202 - TextureName: "Texture::GridFloor_udon_png" + TextureName: "Texture::dev_measurewall01d_png" Properties60: { Property: "Translation", "Vector", "A+",0,0,0 Property: "Rotation", "Vector", "A+",0,0,0 @@ -797,9 +797,9 @@ Objects: { Property: "TextureScalingPivot", "Vector3D", "",0,0,0 Property: "VideoProperty", "object", "" } - Media: "Video::GridFloor_udon_png" - FileName: "GridFloor_udon.png" - RelativeFilename: "C:\Users\raccoon\Workspace\Unity\VRChat\measuregeneric-world\Assets\measuregeneric\textures\GridFloor_udon.png" + Media: "Video::dev_measurewall01d_png" + FileName: "dev_measurewall01d.png" + RelativeFilename: "C:\Users\raccoon\Workspace\Unity\VRChat\measuregeneric-world\Assets\measuregeneric\textures\dev_measurewall01d.png" ModelUVTranslation: 0,0 ModelUVScaling: 1,1 Texture_Alpha_Source: "None" @@ -885,11 +885,11 @@ Relations: { } Model: "Model::Camera Switcher", "CameraSwitcher" { } - Material: "Material::None__GridFloor_udon_png", "" { + Material: "Material::None__dev_measurewall01d_png", "" { } - Texture: "Texture::GridFloor_udon_png", "TextureVideoClip" { + Texture: "Texture::dev_measurewall01d_png", "TextureVideoClip" { } - Video: "Video::GridFloor_udon_png", "Clip" { + Video: "Video::dev_measurewall01d_png", "Clip" { } GroupSelection: "GroupSelection::room", "Default" { } @@ -904,17 +904,17 @@ Connections: { Connect: "OO", "Model::Wall_S", "Model::Scene" Connect: "OO", "Model::Wall_N", "Model::Scene" Connect: "OO", "Model::Floor", "Model::Scene" - Connect: "OO", "Material::None__GridFloor_udon_png", "Model::Wall_E" - Connect: "OO", "Material::None__GridFloor_udon_png", "Model::Wall_W" - Connect: "OO", "Material::None__GridFloor_udon_png", "Model::Wall_S" - Connect: "OO", "Material::None__GridFloor_udon_png", "Model::Wall_N" - Connect: "OO", "Material::None__GridFloor_udon_png", "Model::Floor" - Connect: "OO", "Texture::GridFloor_udon_png", "Model::Wall_E" - Connect: "OO", "Texture::GridFloor_udon_png", "Model::Wall_W" - Connect: "OO", "Texture::GridFloor_udon_png", "Model::Wall_S" - Connect: "OO", "Texture::GridFloor_udon_png", "Model::Wall_N" - Connect: "OO", "Texture::GridFloor_udon_png", "Model::Floor" - Connect: "OO", "Video::GridFloor_udon_png", "Texture::GridFloor_udon_png" + Connect: "OO", "Material::None__dev_measurewall01d_png", "Model::Wall_E" + Connect: "OO", "Material::None__dev_measurewall01d_png", "Model::Wall_W" + Connect: "OO", "Material::None__dev_measurewall01d_png", "Model::Wall_S" + Connect: "OO", "Material::None__dev_measurewall01d_png", "Model::Wall_N" + Connect: "OO", "Material::None__dev_measurewall01d_png", "Model::Floor" + Connect: "OO", "Texture::dev_measurewall01d_png", "Model::Wall_E" + Connect: "OO", "Texture::dev_measurewall01d_png", "Model::Wall_W" + Connect: "OO", "Texture::dev_measurewall01d_png", "Model::Wall_S" + Connect: "OO", "Texture::dev_measurewall01d_png", "Model::Wall_N" + Connect: "OO", "Texture::dev_measurewall01d_png", "Model::Floor" + Connect: "OO", "Video::dev_measurewall01d_png", "Texture::dev_measurewall01d_png" Connect: "OO", "Model::Wall_E", "GroupSelection::room" Connect: "OO", "Model::Wall_W", "GroupSelection::room" Connect: "OO", "Model::Wall_S", "GroupSelection::room" diff --git a/Assets/measuregeneric/mesh/fbx/room.fbx.meta b/Assets/measuregeneric/mesh/fbx/room.fbx.meta index a59ab6d..b32c315 100644 --- a/Assets/measuregeneric/mesh/fbx/room.fbx.meta +++ b/Assets/measuregeneric/mesh/fbx/room.fbx.meta @@ -48,12 +48,12 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 1 bakeAxisConversion: 0 - preserveHierarchy: 0 + preserveHierarchy: 1 skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001