Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move MToon10 material io definitions from VRMShaders to VRM10 #2366

Merged
merged 6 commits into from
Jul 23, 2024

Conversation

Santarh
Copy link
Contributor

@Santarh Santarh commented Jul 18, 2024

VRMShaders 解体の一環として、MToon10 パッケージを VRMShaders から VRM10 に移動します。

変更対象の定義は、通常の VRM 1.0 ロード実装において利用されるものではありません。
しかし asmdef と名前空間の変更が行われるため、asmdef 参照と名前空間 using の変更対応が必要な場合があります。

asmdef

before after
VRMShaders.VRM10.MToon10.Runtime.asmdef VRM10.MToon10.asmdef
VRMShaders.VRM10.MToon10.Editor.asmdef VRM10.MToon10.Editor.asmdef
VRMShaders.VRM10.MToon10.Tests.asmdef VRM10.MToon10.Tests.asmdef

namespace

before after
VRMShaders.VRM10.MToon10.Runtime.* VRM10.MToon10.*
VRMShaders.VRM10.MToon10.Runtime.MToon0X.* VRM10.MToon10.MToon0X.*
VRMShaders.VRM10.MToon10.Editor.* VRM10.MToon10.Editor.*

Shader CustomEditor

before after
VRMShaders.VRM10.MToon10.Editor.MToonInspector VRM10.MToon10.Editor.MToonInspector

class

before after
VRMShaders.VRM10.MToon10.Editor.EditorMenu VRM10.MToon10.Editor.EditorMenu
VRMShaders.VRM10.MToon10.Editor.MToonInspector VRM10.MToon10.Editor.MToonInspector
VRMShaders.VRM10.MToon10.Runtime.MaterialExtensions VRM10.MToon10.MaterialExtensions
VRMShaders.VRM10.MToon10.Runtime.MToon10EmissiveMapKeyword VRM10.MToon10.MToon10EmissiveMapKeyword
VRMShaders.VRM10.MToon10.Runtime.MToon10NormalMapKeyword VRM10.MToon10.MToon10NormalMapKeyword
VRMShaders.VRM10.MToon10.Runtime.MToon10OutlineModeKeyword VRM10.MToon10.MToon10OutlineModeKeyword
VRMShaders.VRM10.MToon10.Runtime.MToon10ParameterMapKeyword VRM10.MToon10.MToon10ParameterMapKeyword
VRMShaders.VRM10.MToon10.Runtime.MToon10RimMapKeyword VRM10.MToon10.MToon10RimMapKeyword
VRMShaders.VRM10.MToon10.Runtime.MToon10Meta VRM10.MToon10.MToon10Meta
VRMShaders.VRM10.MToon10.Runtime.MToon10Properties VRM10.MToon10.MToon10Properties
VRMShaders.VRM10.MToon10.Runtime.UnityAlphaModeKeyword VRM10.MToon10.UnityAlphaModeKeyword
VRMShaders.VRM10.MToon10.Runtime.UnityRenderTag VRM10.MToon10.UnityRenderTag
VRMShaders.VRM10.MToon10.Runtime.MToon10Context VRM10.MToon10.MToon10Context
VRMShaders.VRM10.MToon10.Runtime.MToon10Migrator VRM10.MToon10.MToon10Migrator
VRMShaders.VRM10.MToon10.Runtime.MToonMaterialMigrator VRM10.MToon10.MToonMaterialMigrator
VRMShaders.VRM10.MToon10.Runtime.MToonOutlineRenderFeature VRM10.MToon10.MToonOutlineRenderFeature
VRMShaders.VRM10.MToon10.Runtime.MToonOutlineRenderPass VRM10.MToon10.MToonOutlineRenderPass
VRMShaders.VRM10.MToon10.Runtime.MToonValidator VRM10.MToon10.MToonValidator
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XDefinition VRM10.MToon10.MToon0X.MToon0XDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XMetaDefinition VRM10.MToon10.MToon0X.MToon0XMetaDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XRenderingDefinition VRM10.MToon10.MToon0X.MToon0XRenderingDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XColorDefinition VRM10.MToon10.MToon0X.MToon0XColorDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XLightingDefinition VRM10.MToon10.MToon0X.MToon0XLightingDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XLitAndShadeMixingDefinition VRM10.MToon10.MToon0X.MToon0XLitAndShadeMixingDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XLightingInfluenceDefinition VRM10.MToon10.MToon0X.MToon0XLightingInfluenceDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XEmissionDefinition VRM10.MToon10.MToon0X.MToon0XEmissionDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XMatCapDefinition VRM10.MToon10.MToon0X.MToon0XMatCapDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XRimDefinition VRM10.MToon10.MToon0X.MToon0XRimDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XNormalDefinition VRM10.MToon10.MToon0X.MToon0XNormalDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XOutlineDefinition VRM10.MToon10.MToon0X.MToon0XOutlineDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XTextureUvCoordsDefinition VRM10.MToon10.MToon0X.MToon0XTextureUvCoordsDefinition
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XUtils VRM10.MToon10.MToon0X.MToon0XUtils

struct

before after
VRMShaders.VRM10.MToon10.Editor.LabelScope VRM10.MToon10.Editor.LabelScope

enum

before after
VRMShaders.VRM10.MToon10.Editor.MToon10EditorEditMode VRM10.MToon10.Editor.MToon10EditorEditMode
VRMShaders.VRM10.MToon10.Runtime.MToon10AlphaMode VRM10.MToon10.MToon10AlphaMode
VRMShaders.VRM10.MToon10.Runtime.MToon10DoubleSidedMode VRM10.MToon10.MToon10DoubleSidedMode
VRMShaders.VRM10.MToon10.Runtime.MToon10OutlineMode VRM10.MToon10.MToon10OutlineMode
VRMShaders.VRM10.MToon10.Runtime.MToon10TransparentWithZWriteMode VRM10.MToon10.MToon10TransparentWithZWriteMode
VRMShaders.VRM10.MToon10.Runtime.MToon10Prop VRM10.MToon10.MToon10Prop
VRMShaders.VRM10.MToon10.Runtime.UnityAlphaToMaskMode VRM10.MToon10.UnityAlphaToMaskMode
VRMShaders.VRM10.MToon10.Runtime.UnityCullMode VRM10.MToon10.UnityCullMode
VRMShaders.VRM10.MToon10.Runtime.UnityZWriteMode VRM10.MToon10.UnityZWriteMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XDebugMode VRM10.MToon10.MToon0X.MToon0XDebugMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XOutlineColorMode VRM10.MToon10.MToon0X.MToon0XOutlineColorMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XOutlineWidthMode VRM10.MToon10.MToon0X.MToon0XOutlineWidthMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XRenderMode VRM10.MToon10.MToon0X.MToon0XRenderMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XCullMode VRM10.MToon10.MToon0X.MToon0XCullMode
VRMShaders.VRM10.MToon10.Runtime.MToon0X.MToon0XRenderQueueRequirement VRM10.MToon10.MToon0X.MToon0XRenderQueueRequirement

@Santarh Santarh changed the title [WIP] Move MToon10 from VRMShaders to VRM10 [WIP] Move namespace of MToon10 from VRMShaders to VRM10 Jul 18, 2024
@Santarh Santarh changed the title [WIP] Move namespace of MToon10 from VRMShaders to VRM10 [WIP] Move MToon10 from VRMShaders to VRM10 Jul 18, 2024
@Santarh Santarh changed the title [WIP] Move MToon10 from VRMShaders to VRM10 [WIP] Move MToon10 material io definitions from VRMShaders to VRM10 Jul 18, 2024
@ousttrue ousttrue added this to the v0.124.3 CustomIcon milestone Jul 19, 2024
@Santarh Santarh changed the title [WIP] Move MToon10 material io definitions from VRMShaders to VRM10 Move MToon10 material io definitions from VRMShaders to VRM10 Jul 20, 2024
Copy link
Contributor

@ousttrue ousttrue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move 👍

@Santarh Santarh merged commit b841f53 into vrm-c:master Jul 23, 2024
1 check passed
@Santarh Santarh deleted the disassemblyVrmShaders2 branch July 23, 2024 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants