diff --git a/editor/assets/default_file_content/animation-clip.meta b/editor/assets/default_file_content/animation-clip.meta new file mode 100644 index 00000000000..51859ad5fb8 --- /dev/null +++ b/editor/assets/default_file_content/animation-clip.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "4546c992-f5d1-4225-9f01-a7437d9623cc", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/anim b/editor/assets/default_file_content/animation-clip/default.anim similarity index 100% rename from editor/assets/default_file_content/anim rename to editor/assets/default_file_content/animation-clip/default.anim diff --git a/editor/assets/default_file_content/animation-clip/default.anim.meta b/editor/assets/default_file_content/animation-clip/default.anim.meta new file mode 100644 index 00000000000..1049664c366 --- /dev/null +++ b/editor/assets/default_file_content/animation-clip/default.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "8c76e1e2-a206-4662-aa79-42c0c858d647", + "files": [ + ".bin" + ], + "subMetas": {}, + "userData": { + "name": "default" + } +} diff --git a/editor/assets/default_file_content/animation-graph-variant.meta b/editor/assets/default_file_content/animation-graph-variant.meta new file mode 100644 index 00000000000..f1cc35d6470 --- /dev/null +++ b/editor/assets/default_file_content/animation-graph-variant.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "43e2880e-6fce-4363-bba5-a80bc5299964", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/animgraphvari b/editor/assets/default_file_content/animation-graph-variant/default.animgraphvari similarity index 100% rename from editor/assets/default_file_content/animgraphvari rename to editor/assets/default_file_content/animation-graph-variant/default.animgraphvari diff --git a/editor/assets/default_file_content/animgraphvari.meta b/editor/assets/default_file_content/animation-graph-variant/default.animgraphvari.meta similarity index 79% rename from editor/assets/default_file_content/animgraphvari.meta rename to editor/assets/default_file_content/animation-graph-variant/default.animgraphvari.meta index c5462ef1f14..8a66671f117 100644 --- a/editor/assets/default_file_content/animgraphvari.meta +++ b/editor/assets/default_file_content/animation-graph-variant/default.animgraphvari.meta @@ -1,10 +1,9 @@ { "ver": "1.0.0", - "importer": "*", + "importer": "animation-graph-variant", "imported": true, "uuid": "eb9a3479-6087-45cb-82bc-d72e2aa6e9ef", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/animation-graph.meta b/editor/assets/default_file_content/animation-graph.meta new file mode 100644 index 00000000000..5f9230a99b4 --- /dev/null +++ b/editor/assets/default_file_content/animation-graph.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "0a76fdfc-8d5a-490d-bee9-3322784e8fdf", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/animgraph b/editor/assets/default_file_content/animation-graph/default.animgraph similarity index 100% rename from editor/assets/default_file_content/animgraph rename to editor/assets/default_file_content/animation-graph/default.animgraph diff --git a/editor/assets/default_file_content/animgraph.meta b/editor/assets/default_file_content/animation-graph/default.animgraph.meta similarity index 73% rename from editor/assets/default_file_content/animgraph.meta rename to editor/assets/default_file_content/animation-graph/default.animgraph.meta index dce50cc080c..bea98280757 100644 --- a/editor/assets/default_file_content/animgraph.meta +++ b/editor/assets/default_file_content/animation-graph/default.animgraph.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.2.0", + "importer": "animation-graph", "imported": true, "uuid": "e0a8e34d-9242-4f0f-833b-f57e1ffbf285", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/ts-animation-graph b/editor/assets/default_file_content/animation-graph/ts-animation-graph similarity index 100% rename from editor/assets/default_file_content/ts-animation-graph rename to editor/assets/default_file_content/animation-graph/ts-animation-graph diff --git a/editor/assets/default_file_content/ts-animation-graph.meta b/editor/assets/default_file_content/animation-graph/ts-animation-graph.meta similarity index 100% rename from editor/assets/default_file_content/ts-animation-graph.meta rename to editor/assets/default_file_content/animation-graph/ts-animation-graph.meta diff --git a/editor/assets/default_file_content/animation-mask.meta b/editor/assets/default_file_content/animation-mask.meta new file mode 100644 index 00000000000..98ccd9a4487 --- /dev/null +++ b/editor/assets/default_file_content/animation-mask.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "de7dba35-46ed-49f5-aac3-aad7bf168244", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/animask b/editor/assets/default_file_content/animation-mask/default.animask similarity index 100% rename from editor/assets/default_file_content/animask rename to editor/assets/default_file_content/animation-mask/default.animask diff --git a/editor/assets/default_file_content/animask.meta b/editor/assets/default_file_content/animation-mask/default.animask.meta similarity index 83% rename from editor/assets/default_file_content/animask.meta rename to editor/assets/default_file_content/animation-mask/default.animask.meta index c9b02bd843a..466aff79dea 100644 --- a/editor/assets/default_file_content/animask.meta +++ b/editor/assets/default_file_content/animation-mask/default.animask.meta @@ -1,10 +1,9 @@ { "ver": "1.0.0", - "importer": "*", + "importer": "animation-mask", "imported": true, "uuid": "51840015-b47a-4103-a937-6c21a29e4410", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/auto-atlas.meta b/editor/assets/default_file_content/auto-atlas.meta new file mode 100644 index 00000000000..ea3746767af --- /dev/null +++ b/editor/assets/default_file_content/auto-atlas.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "78f306fc-1be9-4ad2-a316-4575664f356d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/pac b/editor/assets/default_file_content/auto-atlas/default.pac similarity index 100% rename from editor/assets/default_file_content/pac rename to editor/assets/default_file_content/auto-atlas/default.pac diff --git a/editor/assets/default_file_content/auto-atlas/default.pac.meta b/editor/assets/default_file_content/auto-atlas/default.pac.meta new file mode 100644 index 00000000000..541a9e4d8d9 --- /dev/null +++ b/editor/assets/default_file_content/auto-atlas/default.pac.meta @@ -0,0 +1,36 @@ +{ + "ver": "1.0.8", + "importer": "auto-atlas", + "imported": true, + "uuid": "e220b271-6a70-47c0-8d12-850150694608", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "maxWidth": 1024, + "maxHeight": 1024, + "padding": 2, + "allowRotation": true, + "forceSquared": false, + "powerOfTwo": false, + "algorithm": "MaxRects", + "format": "png", + "quality": 80, + "contourBleed": true, + "paddingBleed": true, + "filterUnused": true, + "removeTextureInBundle": true, + "removeImageInBundle": true, + "removeSpriteAtlasInBundle": true, + "compressSettings": {}, + "textureSetting": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + } + } +} diff --git a/editor/assets/default_file_content/effect-header.meta b/editor/assets/default_file_content/effect-header.meta new file mode 100644 index 00000000000..d62796796e6 --- /dev/null +++ b/editor/assets/default_file_content/effect-header.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a4e0a48a-179d-4595-9103-9686192f81f1", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/chunk b/editor/assets/default_file_content/effect-header/chunk similarity index 100% rename from editor/assets/default_file_content/chunk rename to editor/assets/default_file_content/effect-header/chunk diff --git a/editor/assets/default_file_content/chunk.meta b/editor/assets/default_file_content/effect-header/chunk.meta similarity index 100% rename from editor/assets/default_file_content/chunk.meta rename to editor/assets/default_file_content/effect-header/chunk.meta diff --git a/editor/assets/default_file_content/effect.meta b/editor/assets/default_file_content/effect.meta index fe9f89828ef..5a9e29fcd83 100644 --- a/editor/assets/default_file_content/effect.meta +++ b/editor/assets/default_file_content/effect.meta @@ -1,12 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.2.0", + "importer": "directory", "imported": true, - "uuid": "d9956a56-5622-44a1-8b50-42449f24ecdd", - "files": [ - "", - ".json" - ], + "uuid": "ade4f075-dc54-4ded-8f19-e94a092b6abc", + "files": [], "subMetas": {}, "userData": {} } diff --git a/editor/assets/default_file_content/effect b/editor/assets/default_file_content/effect/default.effect similarity index 100% rename from editor/assets/default_file_content/effect rename to editor/assets/default_file_content/effect/default.effect diff --git a/editor/assets/default_file_content/anim.meta b/editor/assets/default_file_content/effect/default.effect.meta similarity index 58% rename from editor/assets/default_file_content/anim.meta rename to editor/assets/default_file_content/effect/default.effect.meta index 244cc6ada5d..dcc1a9f72e8 100644 --- a/editor/assets/default_file_content/anim.meta +++ b/editor/assets/default_file_content/effect/default.effect.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.7.1", + "importer": "effect", "imported": true, - "uuid": "8c76e1e2-a206-4662-aa79-42c0c858d647", + "uuid": "b546c596-5f73-40be-a426-cff8df144ac8", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/effect-surface b/editor/assets/default_file_content/effect/effect-surface.effect similarity index 96% rename from editor/assets/default_file_content/effect-surface rename to editor/assets/default_file_content/effect/effect-surface.effect index 671e1d0d531..d8a2651b0f1 100644 --- a/editor/assets/default_file_content/effect-surface +++ b/editor/assets/default_file_content/effect/effect-surface.effect @@ -1,239 +1,239 @@ -// Effect Syntax Guide: https://docs.cocos.com/creator/manual/zh/shader/index.html - -CCEffect %{ - techniques: - - name: opaque - passes: - - vert: standard-vs - frag: standard-fs - properties: &props - mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } - mainColor: { value: [1.0, 1.0, 1.0, 1.0], target: albedo, linear: true, editor: { displayName: Albedo, type: color } } - albedoScale: { value: [1.0, 1.0, 1.0], target: albedoScaleAndCutoff.xyz } - alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST, slide: true, range: [0, 1.0], step: 0.001 } } - roughness: { value: 0.8, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } - metallic: { value: 0.6, target: pbrParams.z, editor: { slide: true, range: [0, 1.0], step: 0.001 } } - - &forward-add - vert: standard-vs - frag: standard-fs - phase: forward-add - propertyIndex: 0 - embeddedMacros: { CC_FORWARD_ADD: true } - depthStencilState: - depthFunc: equal - depthTest: true - depthWrite: false - blendState: - targets: - - blend: true - blendSrc: one - blendDst: one - blendSrcAlpha: zero - blendDstAlpha: one - - &shadow-caster - vert: shadow-caster-vs - frag: shadow-caster-fs - phase: shadow-caster - propertyIndex: 0 - rasterizerState: - cullMode: front - properties: - mainColor: { value: [1.0, 1.0, 1.0, 1.0], target: albedo, editor: { displayName: Albedo, type: color } } - albedoScale: { value: [1.0, 1.0, 1.0], target: albedoScaleAndCutoff.xyz } - alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST } } - mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } - - name: transparent - passes: - - vert: standard-vs - frag: standard-fs - embeddedMacros: { CC_FORCE_FORWARD_SHADING: true } - depthStencilState: - depthTest: true - depthWrite: false - blendState: - targets: - - blend: true - blendSrc: src_alpha - blendDst: one_minus_src_alpha - blendDstAlpha: one_minus_src_alpha - properties: *props - - *forward-add - - *shadow-caster -}% - - -CCProgram shared-ubos %{ - uniform Constants { - vec4 albedo; - vec4 albedoScaleAndCutoff; - vec4 pbrParams; - }; -}% - -CCProgram macro-remapping %{ - // ui displayed macros - #pragma define-meta USE_TWOSIDE - #pragma define-meta USE_VERTEX_COLOR - - #define CC_SURFACES_USE_TWO_SIDED USE_TWOSIDE - #define CC_SURFACES_USE_VERTEX_COLOR USE_VERTEX_COLOR -}% -CCProgram surface-vertex %{ - #define CC_SURFACES_VERTEX_MODIFY_WORLD_POS - vec3 SurfacesVertexModifyWorldPos(in SurfacesStandardVertexIntermediate In) - { - return In.worldPos; - } - - #define CC_SURFACES_VERTEX_MODIFY_WORLD_NORMAL - vec3 SurfacesVertexModifyWorldNormal(in SurfacesStandardVertexIntermediate In) - { - return In.worldNormal.xyz; - } - - #define CC_SURFACES_VERTEX_MODIFY_UV - void SurfacesVertexModifyUV(inout SurfacesStandardVertexIntermediate In) - { - } -}% - - -CCProgram surface-fragment %{ - #if USE_ALBEDO_MAP - uniform sampler2D albedoMap; - #pragma define-meta ALBEDO_UV options([v_uv, v_uv1]) - #endif - - #if USE_ALPHA_TEST - #pragma define-meta ALPHA_TEST_CHANNEL options([a, r]) - #endif - - #define CC_SURFACES_FRAGMENT_MODIFY_BASECOLOR_AND_TRANSPARENCY - vec4 SurfacesFragmentModifyBaseColorAndTransparency() - { - vec4 baseColor = albedo; - - #if USE_ALBEDO_MAP - vec4 texColor = texture(albedoMap, ALBEDO_UV); - texColor.rgb = SRGBToLinear(texColor.rgb); - baseColor *= texColor; - #endif - - #if USE_ALPHA_TEST - if (baseColor.ALPHA_TEST_CHANNEL < albedoScaleAndCutoff.w) discard; - #endif - - baseColor.rgb *= albedoScaleAndCutoff.xyz; - return baseColor; - } - - #define CC_SURFACES_FRAGMENT_ALPHA_CLIP_ONLY - void SurfacesFragmentAlphaClipOnly() - { - #if USE_ALPHA_TEST - float alpha = albedo.ALPHA_TEST_CHANNEL; - #if USE_VERTEX_COLOR - alpha *= FSInput_vertexColor.a; - #endif - #if USE_ALBEDO_MAP - alpha = texture(albedoMap, ALBEDO_UV).ALPHA_TEST_CHANNEL; - #endif - - if (alpha < albedoScaleAndCutoff.w) discard; - #endif - } - - #define CC_SURFACES_FRAGMENT_MODIFY_WORLD_NORMAL - vec3 SurfacesFragmentModifyWorldNormal() - { - return normalize(FSInput_worldNormal); - } - - #define CC_SURFACES_FRAGMENT_MODIFY_EMISSIVE - vec3 SurfacesFragmentModifyEmissive() - { - return vec3(0.0, 0.0, 0.0); - } - - #define CC_SURFACES_FRAGMENT_MODIFY_PBRPARAMS - vec4 SurfacesFragmentModifyPBRParams() - { - // ao, roughness, metallic, specularIntensity - return vec4(1.0, pbrParams.y, pbrParams.z, 0.5); - } -}% - - - - -CCProgram standard-vs %{ - precision highp float; - - // 1. surface internal macros, for technique usage or remapping some user (material) macros to surface internal macros - #include - #include - - // 2. common include with corresponding shader stage, include before surface functions - #include - - // 3. user surface functions that can use user (effect) parameters (ubo Constants) - // see surfaces/default-functions/xxx.chunk - #include - #include - - // 4. surface include with corresponding shader stage and shading-model (optional) - #include - - // 5. shader entry with corresponding shader stage and technique usage/type - #include -}% - - -CCProgram shadow-caster-vs %{ - precision highp float; - #include - #include - #include - #include - #include -}% - - - -CCProgram standard-fs %{ - // shading-model : standard - // lighting-model : standard (isotropy / anisotropy pbr) - // shader stage : fs - // technique usage/type : render-to-scene - - precision highp float; - // 1. surface internal macros, for technique usage or remapping some user (material) macros to surface internal macros - #include - #include - - // 2. common include with corresponding shader stage, include before surface functions - #include - - // 3. user surface functions that can use user (effect) parameters (ubo Constants) - // see surfaces/default-functions/xxx.chunk - #include - #include - - // 4. lighting-model (optional) - #include - - // 5. surface include with corresponding shader stage and shading-model (optional) - #include - - // 6. shader entry with corresponding shader stage and technique usage/type - #include -}% - -CCProgram shadow-caster-fs %{ - precision highp float; - #include - #include - #include - #include - #include -}% +// Effect Syntax Guide: https://docs.cocos.com/creator/manual/zh/shader/index.html + +CCEffect %{ + techniques: + - name: opaque + passes: + - vert: standard-vs + frag: standard-fs + properties: &props + mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } + mainColor: { value: [1.0, 1.0, 1.0, 1.0], target: albedo, linear: true, editor: { displayName: Albedo, type: color } } + albedoScale: { value: [1.0, 1.0, 1.0], target: albedoScaleAndCutoff.xyz } + alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST, slide: true, range: [0, 1.0], step: 0.001 } } + roughness: { value: 0.8, target: pbrParams.y, editor: { slide: true, range: [0, 1.0], step: 0.001 } } + metallic: { value: 0.6, target: pbrParams.z, editor: { slide: true, range: [0, 1.0], step: 0.001 } } + - &forward-add + vert: standard-vs + frag: standard-fs + phase: forward-add + propertyIndex: 0 + embeddedMacros: { CC_FORWARD_ADD: true } + depthStencilState: + depthFunc: equal + depthTest: true + depthWrite: false + blendState: + targets: + - blend: true + blendSrc: one + blendDst: one + blendSrcAlpha: zero + blendDstAlpha: one + - &shadow-caster + vert: shadow-caster-vs + frag: shadow-caster-fs + phase: shadow-caster + propertyIndex: 0 + rasterizerState: + cullMode: front + properties: + mainColor: { value: [1.0, 1.0, 1.0, 1.0], target: albedo, editor: { displayName: Albedo, type: color } } + albedoScale: { value: [1.0, 1.0, 1.0], target: albedoScaleAndCutoff.xyz } + alphaThreshold: { value: 0.5, target: albedoScaleAndCutoff.w, editor: { parent: USE_ALPHA_TEST } } + mainTexture: { value: grey, target: albedoMap, editor: { displayName: AlbedoMap } } + - name: transparent + passes: + - vert: standard-vs + frag: standard-fs + embeddedMacros: { CC_FORCE_FORWARD_SHADING: true } + depthStencilState: + depthTest: true + depthWrite: false + blendState: + targets: + - blend: true + blendSrc: src_alpha + blendDst: one_minus_src_alpha + blendDstAlpha: one_minus_src_alpha + properties: *props + - *forward-add + - *shadow-caster +}% + + +CCProgram shared-ubos %{ + uniform Constants { + vec4 albedo; + vec4 albedoScaleAndCutoff; + vec4 pbrParams; + }; +}% + +CCProgram macro-remapping %{ + // ui displayed macros + #pragma define-meta USE_TWOSIDE + #pragma define-meta USE_VERTEX_COLOR + + #define CC_SURFACES_USE_TWO_SIDED USE_TWOSIDE + #define CC_SURFACES_USE_VERTEX_COLOR USE_VERTEX_COLOR +}% +CCProgram surface-vertex %{ + #define CC_SURFACES_VERTEX_MODIFY_WORLD_POS + vec3 SurfacesVertexModifyWorldPos(in SurfacesStandardVertexIntermediate In) + { + return In.worldPos; + } + + #define CC_SURFACES_VERTEX_MODIFY_WORLD_NORMAL + vec3 SurfacesVertexModifyWorldNormal(in SurfacesStandardVertexIntermediate In) + { + return In.worldNormal.xyz; + } + + #define CC_SURFACES_VERTEX_MODIFY_UV + void SurfacesVertexModifyUV(inout SurfacesStandardVertexIntermediate In) + { + } +}% + + +CCProgram surface-fragment %{ + #if USE_ALBEDO_MAP + uniform sampler2D albedoMap; + #pragma define-meta ALBEDO_UV options([v_uv, v_uv1]) + #endif + + #if USE_ALPHA_TEST + #pragma define-meta ALPHA_TEST_CHANNEL options([a, r]) + #endif + + #define CC_SURFACES_FRAGMENT_MODIFY_BASECOLOR_AND_TRANSPARENCY + vec4 SurfacesFragmentModifyBaseColorAndTransparency() + { + vec4 baseColor = albedo; + + #if USE_ALBEDO_MAP + vec4 texColor = texture(albedoMap, ALBEDO_UV); + texColor.rgb = SRGBToLinear(texColor.rgb); + baseColor *= texColor; + #endif + + #if USE_ALPHA_TEST + if (baseColor.ALPHA_TEST_CHANNEL < albedoScaleAndCutoff.w) discard; + #endif + + baseColor.rgb *= albedoScaleAndCutoff.xyz; + return baseColor; + } + + #define CC_SURFACES_FRAGMENT_ALPHA_CLIP_ONLY + void SurfacesFragmentAlphaClipOnly() + { + #if USE_ALPHA_TEST + float alpha = albedo.ALPHA_TEST_CHANNEL; + #if USE_VERTEX_COLOR + alpha *= FSInput_vertexColor.a; + #endif + #if USE_ALBEDO_MAP + alpha = texture(albedoMap, ALBEDO_UV).ALPHA_TEST_CHANNEL; + #endif + + if (alpha < albedoScaleAndCutoff.w) discard; + #endif + } + + #define CC_SURFACES_FRAGMENT_MODIFY_WORLD_NORMAL + vec3 SurfacesFragmentModifyWorldNormal() + { + return normalize(FSInput_worldNormal); + } + + #define CC_SURFACES_FRAGMENT_MODIFY_EMISSIVE + vec3 SurfacesFragmentModifyEmissive() + { + return vec3(0.0, 0.0, 0.0); + } + + #define CC_SURFACES_FRAGMENT_MODIFY_PBRPARAMS + vec4 SurfacesFragmentModifyPBRParams() + { + // ao, roughness, metallic, specularIntensity + return vec4(1.0, pbrParams.y, pbrParams.z, 0.5); + } +}% + + + + +CCProgram standard-vs %{ + precision highp float; + + // 1. surface internal macros, for technique usage or remapping some user (material) macros to surface internal macros + #include + #include + + // 2. common include with corresponding shader stage, include before surface functions + #include + + // 3. user surface functions that can use user (effect) parameters (ubo Constants) + // see surfaces/default-functions/xxx.chunk + #include + #include + + // 4. surface include with corresponding shader stage and shading-model (optional) + #include + + // 5. shader entry with corresponding shader stage and technique usage/type + #include +}% + + +CCProgram shadow-caster-vs %{ + precision highp float; + #include + #include + #include + #include + #include +}% + + + +CCProgram standard-fs %{ + // shading-model : standard + // lighting-model : standard (isotropy / anisotropy pbr) + // shader stage : fs + // technique usage/type : render-to-scene + + precision highp float; + // 1. surface internal macros, for technique usage or remapping some user (material) macros to surface internal macros + #include + #include + + // 2. common include with corresponding shader stage, include before surface functions + #include + + // 3. user surface functions that can use user (effect) parameters (ubo Constants) + // see surfaces/default-functions/xxx.chunk + #include + #include + + // 4. lighting-model (optional) + #include + + // 5. surface include with corresponding shader stage and shading-model (optional) + #include + + // 6. shader entry with corresponding shader stage and technique usage/type + #include +}% + +CCProgram shadow-caster-fs %{ + precision highp float; + #include + #include + #include + #include + #include +}% diff --git a/editor/assets/default_file_content/effect-surface.meta b/editor/assets/default_file_content/effect/effect-surface.effect.meta similarity index 85% rename from editor/assets/default_file_content/effect-surface.meta rename to editor/assets/default_file_content/effect/effect-surface.effect.meta index caa639a2dfe..79c47db375e 100644 --- a/editor/assets/default_file_content/effect-surface.meta +++ b/editor/assets/default_file_content/effect/effect-surface.effect.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.7.1", + "importer": "effect", "imported": true, "uuid": "6c68ba5e-4590-4a25-bd25-430a0ebc1544", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/flow b/editor/assets/default_file_content/flow deleted file mode 100644 index 7ff7cf3ade9..00000000000 --- a/editor/assets/default_file_content/flow +++ /dev/null @@ -1,7 +0,0 @@ -{ - "__type__": "RenderFlow", - "_name": "", - "_objFlags": 0, - "_native": "", - "renderFlow": null -} \ No newline at end of file diff --git a/editor/assets/default_file_content/flow.meta b/editor/assets/default_file_content/flow.meta deleted file mode 100644 index 860f31213ab..00000000000 --- a/editor/assets/default_file_content/flow.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "2c657d26-de3b-4070-9cad-2ca3a33bbd72", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/js b/editor/assets/default_file_content/js deleted file mode 100644 index 1803536801b..00000000000 --- a/editor/assets/default_file_content/js +++ /dev/null @@ -1,22 +0,0 @@ -import { _decorator, Component, Node } from 'cc'; -const { ccclass, property } = _decorator; - -@ccclass('<%UnderscoreCaseClassName%>') -export class <%UnderscoreCaseClassName%> extends Component { - - // class member could be defined like this. - dummy = ''; - - // Use 'property' decorator if your want the member to be serializable. - @property - serializableDummy = 0; - - start() { - // Your initialization goes here. - } - - update(deltaTime) { - // Your update function goes here. - } - -} diff --git a/editor/assets/default_file_content/js.meta b/editor/assets/default_file_content/js.meta deleted file mode 100644 index 2af8369d44d..00000000000 --- a/editor/assets/default_file_content/js.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "91d50ce0-702d-47fd-b540-447a0de3471d", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/labelatlas.meta b/editor/assets/default_file_content/labelatlas.meta new file mode 100644 index 00000000000..a742e9ce41d --- /dev/null +++ b/editor/assets/default_file_content/labelatlas.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "b0bbeda2-3642-4493-8406-ef5a831eca7f", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/labelatlas/default.labelatlas b/editor/assets/default_file_content/labelatlas/default.labelatlas new file mode 100644 index 00000000000..e69de29bb2d diff --git a/editor/assets/default_file_content/labelatlas/default.labelatlas.meta b/editor/assets/default_file_content/labelatlas/default.labelatlas.meta new file mode 100644 index 00000000000..0a28935e1d0 --- /dev/null +++ b/editor/assets/default_file_content/labelatlas/default.labelatlas.meta @@ -0,0 +1,18 @@ +{ + "ver": "1.0.1", + "importer": "label-atlas", + "imported": true, + "uuid": "39a1ade8-a6ad-40df-8039-970d97bdd80d", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "itemWidth": 2, + "itemHeight": 2, + "fontSize": 0, + "startChar": "", + "spriteFrameUuid": "", + "_fntConfig": {} + } +} diff --git a/editor/assets/default_file_content/material.meta b/editor/assets/default_file_content/material.meta new file mode 100644 index 00000000000..3023228ed6a --- /dev/null +++ b/editor/assets/default_file_content/material.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "37d1763e-7da9-41f4-b109-6a45cdbeb6c8", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/mtl b/editor/assets/default_file_content/material/default.mtl similarity index 100% rename from editor/assets/default_file_content/mtl rename to editor/assets/default_file_content/material/default.mtl diff --git a/editor/assets/default_file_content/mtl.meta b/editor/assets/default_file_content/material/default.mtl.meta similarity index 75% rename from editor/assets/default_file_content/mtl.meta rename to editor/assets/default_file_content/material/default.mtl.meta index 4f96d814839..a4caad652b9 100644 --- a/editor/assets/default_file_content/mtl.meta +++ b/editor/assets/default_file_content/material/default.mtl.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.0.21", + "importer": "material", "imported": true, "uuid": "8f8bba83-df9c-4afe-8450-e12d0dbe71b7", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/pac.meta b/editor/assets/default_file_content/pac.meta deleted file mode 100644 index 1d306ce7d4f..00000000000 --- a/editor/assets/default_file_content/pac.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "e220b271-6a70-47c0-8d12-850150694608", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/physics-material.meta b/editor/assets/default_file_content/physics-material.meta new file mode 100644 index 00000000000..bbf13a7b192 --- /dev/null +++ b/editor/assets/default_file_content/physics-material.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "ed03cbd9-1b80-4814-b9ee-b928c7fe4a07", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/pmtl b/editor/assets/default_file_content/physics-material/default.pmtl similarity index 100% rename from editor/assets/default_file_content/pmtl rename to editor/assets/default_file_content/physics-material/default.pmtl diff --git a/editor/assets/default_file_content/pmtl.meta b/editor/assets/default_file_content/physics-material/default.pmtl.meta similarity index 72% rename from editor/assets/default_file_content/pmtl.meta rename to editor/assets/default_file_content/physics-material/default.pmtl.meta index 50d452aeb40..0deac20b2aa 100644 --- a/editor/assets/default_file_content/pmtl.meta +++ b/editor/assets/default_file_content/physics-material/default.pmtl.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.0.1", + "importer": "physics-material", "imported": true, "uuid": "ad05fddb-302f-40f5-81d2-27f671ddf0b6", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/prefab.meta b/editor/assets/default_file_content/prefab.meta index ac995e8153d..946ff7ac7b2 100644 --- a/editor/assets/default_file_content/prefab.meta +++ b/editor/assets/default_file_content/prefab.meta @@ -1,14 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.2.0", + "importer": "directory", "imported": true, - "uuid": "c9bbaedb-125a-4942-a8eb-6952f9f2a00f", - "files": [ - "", - ".json" - ], + "uuid": "9526b4b1-f759-4849-a99c-1afbcbc4df27", + "files": [], "subMetas": {}, - "userData": { - "syncNodeName": "Node" - } + "userData": {} } diff --git a/editor/assets/default_file_content/prefab b/editor/assets/default_file_content/prefab/default.prefab similarity index 89% rename from editor/assets/default_file_content/prefab rename to editor/assets/default_file_content/prefab/default.prefab index d8f89ab01ec..63c6adbe0df 100644 --- a/editor/assets/default_file_content/prefab +++ b/editor/assets/default_file_content/prefab/default.prefab @@ -1,18 +1,19 @@ [ { "__type__": "cc.Prefab", - "_name": "", + "_name": "default", "_objFlags": 0, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false + "asyncLoadAssets": false, + "persistent": false }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "default", "_objFlags": 0, "_parent": null, "_children": [], diff --git a/editor/assets/default_file_content/prefab/default.prefab.meta b/editor/assets/default_file_content/prefab/default.prefab.meta new file mode 100644 index 00000000000..52c29a78a09 --- /dev/null +++ b/editor/assets/default_file_content/prefab/default.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.48", + "importer": "prefab", + "imported": true, + "uuid": "97b0783e-89f6-49d8-900b-3462bb9cfb04", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "default" + } +} diff --git a/editor/assets/default_file_content/rct.meta b/editor/assets/default_file_content/rct.meta deleted file mode 100644 index d5febe00c4a..00000000000 --- a/editor/assets/default_file_content/rct.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "054f1b2e-3ef6-458f-92f9-0f10a316d5b9", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/render-pipeline.meta b/editor/assets/default_file_content/render-pipeline.meta new file mode 100644 index 00000000000..086e588fafe --- /dev/null +++ b/editor/assets/default_file_content/render-pipeline.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "5f51f44a-de48-4590-bfba-2d69bc3a7540", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/rpp b/editor/assets/default_file_content/render-pipeline/default.rpp similarity index 100% rename from editor/assets/default_file_content/rpp rename to editor/assets/default_file_content/render-pipeline/default.rpp diff --git a/editor/assets/default_file_content/rpp.meta b/editor/assets/default_file_content/render-pipeline/default.rpp.meta similarity index 82% rename from editor/assets/default_file_content/rpp.meta rename to editor/assets/default_file_content/render-pipeline/default.rpp.meta index 58dfcb9401d..be649594263 100644 --- a/editor/assets/default_file_content/rpp.meta +++ b/editor/assets/default_file_content/render-pipeline/default.rpp.meta @@ -1,10 +1,9 @@ { "ver": "1.0.0", - "importer": "*", + "importer": "render-pipeline", "imported": true, "uuid": "c7e748e8-be82-4f6f-b2c0-085b604e40e5", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/forward-pipeline b/editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp similarity index 100% rename from editor/assets/default_file_content/forward-pipeline rename to editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp diff --git a/editor/assets/default_file_content/forward-pipeline.meta b/editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp.meta similarity index 82% rename from editor/assets/default_file_content/forward-pipeline.meta rename to editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp.meta index 77ee61a2539..df76dea3c6d 100644 --- a/editor/assets/default_file_content/forward-pipeline.meta +++ b/editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp.meta @@ -1,10 +1,9 @@ { "ver": "1.0.0", - "importer": "*", + "importer": "render-pipeline", "imported": true, "uuid": "22a135d0-b2ef-4c1b-86d2-5bbbd88e4875", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/ts-render-flow b/editor/assets/default_file_content/render-pipeline/ts-render-flow similarity index 100% rename from editor/assets/default_file_content/ts-render-flow rename to editor/assets/default_file_content/render-pipeline/ts-render-flow diff --git a/editor/assets/default_file_content/ts-render-flow.meta b/editor/assets/default_file_content/render-pipeline/ts-render-flow.meta similarity index 100% rename from editor/assets/default_file_content/ts-render-flow.meta rename to editor/assets/default_file_content/render-pipeline/ts-render-flow.meta diff --git a/editor/assets/default_file_content/ts-render-pipeline b/editor/assets/default_file_content/render-pipeline/ts-render-pipeline similarity index 100% rename from editor/assets/default_file_content/ts-render-pipeline rename to editor/assets/default_file_content/render-pipeline/ts-render-pipeline diff --git a/editor/assets/default_file_content/ts-render-pipeline.meta b/editor/assets/default_file_content/render-pipeline/ts-render-pipeline.meta similarity index 100% rename from editor/assets/default_file_content/ts-render-pipeline.meta rename to editor/assets/default_file_content/render-pipeline/ts-render-pipeline.meta diff --git a/editor/assets/default_file_content/ts-render-stage b/editor/assets/default_file_content/render-pipeline/ts-render-stage similarity index 100% rename from editor/assets/default_file_content/ts-render-stage rename to editor/assets/default_file_content/render-pipeline/ts-render-stage diff --git a/editor/assets/default_file_content/ts-render-stage.meta b/editor/assets/default_file_content/render-pipeline/ts-render-stage.meta similarity index 100% rename from editor/assets/default_file_content/ts-render-stage.meta rename to editor/assets/default_file_content/render-pipeline/ts-render-stage.meta diff --git a/editor/assets/default_file_content/render-texture.meta b/editor/assets/default_file_content/render-texture.meta new file mode 100644 index 00000000000..833037ad731 --- /dev/null +++ b/editor/assets/default_file_content/render-texture.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "8403507a-6661-45fe-ae75-bec607684f53", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/rt b/editor/assets/default_file_content/render-texture/default.rt similarity index 100% rename from editor/assets/default_file_content/rt rename to editor/assets/default_file_content/render-texture/default.rt diff --git a/editor/assets/default_file_content/render-texture/default.rt.meta b/editor/assets/default_file_content/render-texture/default.rt.meta new file mode 100644 index 00000000000..a774a1c61b7 --- /dev/null +++ b/editor/assets/default_file_content/render-texture/default.rt.meta @@ -0,0 +1,40 @@ +{ + "ver": "1.2.2", + "importer": "render-texture", + "imported": true, + "uuid": "865b04b2-bc79-40fc-9bdf-a7557665b27c", + "files": [ + ".json" + ], + "subMetas": { + "f9941": { + "importer": "rt-sprite-frame", + "uuid": "865b04b2-bc79-40fc-9bdf-a7557665b27c@f9941", + "displayName": "default", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "imageUuidOrDatabaseUri": "865b04b2-bc79-40fc-9bdf-a7557665b27c", + "width": 256, + "height": 256 + }, + "ver": "1.0.0", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "width": 256, + "height": 256, + "anisotropy": 0, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "redirect": "865b04b2-bc79-40fc-9bdf-a7557665b27c@f9941" + } +} diff --git a/editor/assets/default_file_content/rfa.meta b/editor/assets/default_file_content/rfa.meta deleted file mode 100644 index e2af93939c7..00000000000 --- a/editor/assets/default_file_content/rfa.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "deed3db9-3111-451e-b67f-620c0a655480", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/rsa.meta b/editor/assets/default_file_content/rsa.meta deleted file mode 100644 index 55d7db5dffb..00000000000 --- a/editor/assets/default_file_content/rsa.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "38594b30-67df-48a7-872a-5cd512339202", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/rt.meta b/editor/assets/default_file_content/rt.meta deleted file mode 100644 index 99b44c16ac2..00000000000 --- a/editor/assets/default_file_content/rt.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "865b04b2-bc79-40fc-9bdf-a7557665b27c", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/scene-quality b/editor/assets/default_file_content/scene-quality deleted file mode 100644 index 806999b2c14..00000000000 --- a/editor/assets/default_file_content/scene-quality +++ /dev/null @@ -1,402 +0,0 @@ -[ - { - "__type__": "cc.SceneAsset", - "_name": "", - "_objFlags": 0, - "_native": "", - "scene": { - "__id__": 1 - } - }, - { - "__type__": "cc.Scene", - "_name": "scene-quality", - "_objFlags": 0, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 5 - } - ], - "_active": true, - "_components": [], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "autoReleaseAssets": false, - "_globals": { - "__id__": 7 - }, - "_reflectionProbeId": 0, - "_id": "19323c5d-5d36-438a-86ee-8288c690e5b0" - }, - { - "__type__": "cc.Node", - "_name": "Main Light", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": -0.06397656665577071, - "y": -0.44608233363525845, - "z": -0.8239028751062036, - "w": -0.3436591377065261 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": -117.894, - "y": -194.909, - "z": 38.562 - }, - "_id": "c0y6F5f+pAvI805TdmxIjx" - }, - { - "__type__": "cc.DirectionalLight", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": null, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 250, - "b": 240, - "a": 255 - }, - "_useColorTemperature": false, - "_colorTemperature": 6550, - "_staticSettings": { - "__id__": 4 - }, - "_visibility": -325058561, - "_illuminanceHDR": 65000, - "_illuminance": 65000, - "_illuminanceLDR": 1.6927083333333335, - "_shadowEnabled": true, - "_shadowPcf": 2, - "_shadowBias": 0.00001, - "_shadowNormalBias": 0, - "_shadowSaturation": 1, - "_shadowDistance": 50, - "_shadowInvisibleOcclusionRange": 200, - "_csmLevel": 4, - "_csmLayerLambda": 0.75, - "_csmOptimizationMode": 2, - "_shadowFixedArea": false, - "_shadowNear": 0.1, - "_shadowFar": 10, - "_shadowOrthoSize": 5, - "_id": "597uMYCbhEtJQc0ffJlcgA" - }, - { - "__type__": "cc.StaticLightSettings", - "_baked": false, - "_editorOnly": false, - "_bakeable": true, - "_castShadow": true - }, - { - "__type__": "cc.Node", - "_name": "Main Camera", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 6 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": -10, - "y": 10, - "z": 10 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": -0.27781593346944056, - "y": -0.36497167621709875, - "z": -0.11507512748638377, - "w": 0.8811195706053617 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": -35, - "y": -45, - "z": 0 - }, - "_id": "c9DMICJLFO5IeO07EPon7U" - }, - { - "__type__": "cc.Camera", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 5 - }, - "_enabled": true, - "__prefab": null, - "_projection": 1, - "_priority": 0, - "_fov": 45, - "_fovAxis": 0, - "_orthoHeight": 10, - "_near": 1, - "_far": 1000, - "_color": { - "__type__": "cc.Color", - "r": 51, - "g": 51, - "b": 51, - "a": 255 - }, - "_depth": 1, - "_stencil": 0, - "_clearFlags": 14, - "_rect": { - "__type__": "cc.Rect", - "x": 0, - "y": 0, - "width": 1, - "height": 1 - }, - "_aperture": 19, - "_shutter": 7, - "_iso": 0, - "_screenScale": 1, - "_visibility": 1822425087, - "_targetTexture": null, - "_cameraType": -1, - "_trackingType": 0, - "_id": "7dWQTpwS5LrIHnc1zAPUtf" - }, - { - "__type__": "cc.SceneGlobals", - "ambient": { - "__id__": 8 - }, - "shadows": { - "__id__": 9 - }, - "_skybox": { - "__id__": 10 - }, - "fog": { - "__id__": 11 - }, - "octree": { - "__id__": 12 - }, - "lightProbeInfo": { - "__id__": 13 - }, - "skin": { - "__id__": 14 - } - }, - { - "__type__": "cc.AmbientInfo", - "_skyColorHDR": { - "__type__": "cc.Vec4", - "x": 0.365754, - "y": 0.568107, - "z": 0.9080791, - "w": 0 - }, - "_skyIllumHDR": 20000, - "_skyIllum": 20000, - "_groundAlbedoHDR": { - "__type__": "cc.Vec4", - "x": 0.455624, - "y": 0.403274, - "z": 0.370948, - "w": 0 - }, - "_skyColorLDR": { - "__type__": "cc.Vec4", - "x": 0.452588, - "y": 0.607642, - "z": 0.755699, - "w": 0 - }, - "_skyIllumLDR": 0.8, - "_groundAlbedoLDR": { - "__type__": "cc.Vec4", - "x": 0.618555, - "y": 0.577848, - "z": 0.544564, - "w": 0 - } - }, - { - "__type__": "cc.ShadowsInfo", - "_enabled": true, - "_type": 1, - "_normal": { - "__type__": "cc.Vec3", - "x": 0, - "y": 1, - "z": 0 - }, - "_distance": 0, - "_shadowColor": { - "__type__": "cc.Color", - "r": 76, - "g": 76, - "b": 76, - "a": 255 - }, - "_maxReceived": 4, - "_size": { - "__type__": "cc.Vec2", - "x": 2048, - "y": 2048 - } - }, - { - "__type__": "cc.SkyboxInfo", - "_envLightingType": 1, - "_envmapHDR": { - "__uuid__": "d032ac98-05e1-4090-88bb-eb640dcb5fc1@b47c0", - "__expectedType__": "cc.TextureCube" - }, - "_envmap": { - "__uuid__": "d032ac98-05e1-4090-88bb-eb640dcb5fc1@b47c0", - "__expectedType__": "cc.TextureCube" - }, - "_envmapLDR": { - "__uuid__": "6f01cf7f-81bf-4a7e-bd5d-0afc19696480@b47c0", - "__expectedType__": "cc.TextureCube" - }, - "_diffuseMapHDR": null, - "_diffuseMapLDR": null, - "_enabled": true, - "_useHDR": true, - "_editableMaterial": null, - "_reflectionHDR": null, - "_reflectionLDR": null, - "_rotationAngle": 0 - }, - { - "__type__": "cc.FogInfo", - "_type": 0, - "_fogColor": { - "__type__": "cc.Color", - "r": 200, - "g": 200, - "b": 200, - "a": 255 - }, - "_enabled": false, - "_fogDensity": 0.3, - "_fogStart": 0.5, - "_fogEnd": 300, - "_fogAtten": 5, - "_fogTop": 1.5, - "_fogRange": 1.2, - "_accurate": false - }, - { - "__type__": "cc.OctreeInfo", - "_enabled": false, - "_minPos": { - "__type__": "cc.Vec3", - "x": -1024, - "y": -1024, - "z": -1024 - }, - "_maxPos": { - "__type__": "cc.Vec3", - "x": 1024, - "y": 1024, - "z": 1024 - }, - "_depth": 8 - }, - { - "__type__": "cc.LightProbeInfo", - "_enabled": false, - "_giScale": 1, - "_giSamples": 1024, - "_bounces": 2, - "_reduceRinging": 0, - "_showProbe": true, - "_showWireframe": true, - "_lightProbeSphereVolume":1, - "_showConvex": false, - "_data": null, - "_lightProbeGroups": [] - }, - { - "__type__": "cc.SkinInfo", - "_enabled": false, - "_scale": 5.0 - } - ] diff --git a/editor/assets/default_file_content/scene.meta b/editor/assets/default_file_content/scene.meta index 070dd26819a..a82b8451871 100644 --- a/editor/assets/default_file_content/scene.meta +++ b/editor/assets/default_file_content/scene.meta @@ -1,12 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.2.0", + "importer": "directory", "imported": true, - "uuid": "3b7550e2-beea-4079-ad8d-dfef104086bd", - "files": [ - "", - ".json" - ], + "uuid": "151e4c9f-dbc1-44ab-8d78-22ee84b24cba", + "files": [], "subMetas": {}, "userData": {} } diff --git a/editor/assets/default_file_content/scene b/editor/assets/default_file_content/scene/default.scene similarity index 93% rename from editor/assets/default_file_content/scene rename to editor/assets/default_file_content/scene/default.scene index 5e93f306e5d..c716768ccbb 100644 --- a/editor/assets/default_file_content/scene +++ b/editor/assets/default_file_content/scene/default.scene @@ -1,7 +1,7 @@ [ { "__type__": "cc.SceneAsset", - "_name": "", + "_name": "default", "_objFlags": 0, "_native": "", "scene": { @@ -28,7 +28,7 @@ "_globals": { "__id__": 7 }, - "_id": "f46876e4-e81b-4931-b493-6d367be385e7" + "_id": "3b7550e2-beea-4079-ad8d-dfef104086bd" }, { "__type__": "cc.Node", @@ -209,33 +209,33 @@ "__type__": "cc.AmbientInfo", "_skyColorHDR": { "__type__": "cc.Vec4", - "x": 0.365754, - "y": 0.568107, - "z": 0.9080791, - "w": 0 + "x": 0.365754, + "y": 0.568107, + "z": 0.9080791, + "w": 0 }, "_skyIllumHDR": 20000, "_skyIllum": 20000, "_groundAlbedoHDR": { "__type__": "cc.Vec4", - "x": 0.455624, - "y": 0.403274, - "z": 0.370948, + "x": 0.455624, + "y": 0.403274, + "z": 0.370948, "w": 0 }, "_skyColorLDR": { "__type__": "cc.Vec4", - "x": 0.452588, - "y": 0.607642, - "z": 0.755699, - "w": 0 + "x": 0.452588, + "y": 0.607642, + "z": 0.755699, + "w": 0 }, "_skyIllumLDR": 0.8, "_groundAlbedoLDR": { "__type__": "cc.Vec4", - "x": 0.618555, - "y": 0.577848, - "z": 0.544564, + "x": 0.618555, + "y": 0.577848, + "z": 0.544564, "w": 0 } }, @@ -314,4 +314,4 @@ "_fogTop": 1.5, "_fogRange": 1.2 } -] +] \ No newline at end of file diff --git a/editor/assets/default_file_content/scene/default.scene.meta b/editor/assets/default_file_content/scene/default.scene.meta new file mode 100644 index 00000000000..112f19f2dc2 --- /dev/null +++ b/editor/assets/default_file_content/scene/default.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.48", + "importer": "scene", + "imported": true, + "uuid": "3b7550e2-beea-4079-ad8d-dfef104086bd", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/scene-2d b/editor/assets/default_file_content/scene/scene-2d.scene similarity index 98% rename from editor/assets/default_file_content/scene-2d rename to editor/assets/default_file_content/scene/scene-2d.scene index df9511524eb..fc3a8d710ba 100644 --- a/editor/assets/default_file_content/scene-2d +++ b/editor/assets/default_file_content/scene/scene-2d.scene @@ -1,7 +1,7 @@ [ { "__type__": "cc.SceneAsset", - "_name": "", + "_name": "scene-2d", "_objFlags": 0, "_native": "", "scene": { @@ -25,7 +25,7 @@ "_globals": { "__id__": 8 }, - "_id": "c77ecaa8-c936-46c4-a5b0-98692673ed87" + "_id": "0359b2f1-3a37-43fa-9c1c-bbe2b353ea1f" }, { "__type__": "cc.Node", @@ -373,6 +373,6 @@ { "__type__": "cc.SkinInfo", "_enabled": false, - "_scale": 5.0 + "_scale": 5 } -] +] \ No newline at end of file diff --git a/editor/assets/default_file_content/scene-2d.meta b/editor/assets/default_file_content/scene/scene-2d.scene.meta similarity index 75% rename from editor/assets/default_file_content/scene-2d.meta rename to editor/assets/default_file_content/scene/scene-2d.scene.meta index 9ea536d9d95..3def86f470f 100644 --- a/editor/assets/default_file_content/scene-2d.meta +++ b/editor/assets/default_file_content/scene/scene-2d.scene.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.1.48", + "importer": "scene", "imported": true, "uuid": "0359b2f1-3a37-43fa-9c1c-bbe2b353ea1f", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/scene/scene-quality.scene b/editor/assets/default_file_content/scene/scene-quality.scene new file mode 100644 index 00000000000..b7fd403826b --- /dev/null +++ b/editor/assets/default_file_content/scene/scene-quality.scene @@ -0,0 +1,402 @@ +[ + { + "__type__": "cc.SceneAsset", + "_name": "scene-quality", + "_objFlags": 0, + "_native": "", + "scene": { + "__id__": 1 + } + }, + { + "__type__": "cc.Scene", + "_name": "scene-quality", + "_objFlags": 0, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 5 + } + ], + "_active": true, + "_components": [], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "autoReleaseAssets": false, + "_globals": { + "__id__": 7 + }, + "_reflectionProbeId": 0, + "_id": "1d5e3139-1826-4b4a-8c4c-2e7b6874a474" + }, + { + "__type__": "cc.Node", + "_name": "Main Light", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": -0.06397656665577071, + "y": -0.44608233363525845, + "z": -0.8239028751062036, + "w": -0.3436591377065261 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": -117.894, + "y": -194.909, + "z": 38.562 + }, + "_id": "c0y6F5f+pAvI805TdmxIjx" + }, + { + "__type__": "cc.DirectionalLight", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": null, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 250, + "b": 240, + "a": 255 + }, + "_useColorTemperature": false, + "_colorTemperature": 6550, + "_staticSettings": { + "__id__": 4 + }, + "_visibility": -325058561, + "_illuminanceHDR": 65000, + "_illuminance": 65000, + "_illuminanceLDR": 1.6927083333333335, + "_shadowEnabled": true, + "_shadowPcf": 2, + "_shadowBias": 0.00001, + "_shadowNormalBias": 0, + "_shadowSaturation": 1, + "_shadowDistance": 50, + "_shadowInvisibleOcclusionRange": 200, + "_csmLevel": 4, + "_csmLayerLambda": 0.75, + "_csmOptimizationMode": 2, + "_shadowFixedArea": false, + "_shadowNear": 0.1, + "_shadowFar": 10, + "_shadowOrthoSize": 5, + "_id": "597uMYCbhEtJQc0ffJlcgA" + }, + { + "__type__": "cc.StaticLightSettings", + "_baked": false, + "_editorOnly": false, + "_bakeable": true, + "_castShadow": true + }, + { + "__type__": "cc.Node", + "_name": "Main Camera", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 6 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -10, + "y": 10, + "z": 10 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": -0.27781593346944056, + "y": -0.36497167621709875, + "z": -0.11507512748638377, + "w": 0.8811195706053617 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": -35, + "y": -45, + "z": 0 + }, + "_id": "c9DMICJLFO5IeO07EPon7U" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 5 + }, + "_enabled": true, + "__prefab": null, + "_projection": 1, + "_priority": 0, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 10, + "_near": 1, + "_far": 1000, + "_color": { + "__type__": "cc.Color", + "r": 51, + "g": 51, + "b": 51, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 14, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 1822425087, + "_targetTexture": null, + "_cameraType": -1, + "_trackingType": 0, + "_id": "7dWQTpwS5LrIHnc1zAPUtf" + }, + { + "__type__": "cc.SceneGlobals", + "ambient": { + "__id__": 8 + }, + "shadows": { + "__id__": 9 + }, + "_skybox": { + "__id__": 10 + }, + "fog": { + "__id__": 11 + }, + "octree": { + "__id__": 12 + }, + "lightProbeInfo": { + "__id__": 13 + }, + "skin": { + "__id__": 14 + } + }, + { + "__type__": "cc.AmbientInfo", + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0.365754, + "y": 0.568107, + "z": 0.9080791, + "w": 0 + }, + "_skyIllumHDR": 20000, + "_skyIllum": 20000, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0.455624, + "y": 0.403274, + "z": 0.370948, + "w": 0 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.452588, + "y": 0.607642, + "z": 0.755699, + "w": 0 + }, + "_skyIllumLDR": 0.8, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.618555, + "y": 0.577848, + "z": 0.544564, + "w": 0 + } + }, + { + "__type__": "cc.ShadowsInfo", + "_enabled": true, + "_type": 1, + "_normal": { + "__type__": "cc.Vec3", + "x": 0, + "y": 1, + "z": 0 + }, + "_distance": 0, + "_shadowColor": { + "__type__": "cc.Color", + "r": 76, + "g": 76, + "b": 76, + "a": 255 + }, + "_maxReceived": 4, + "_size": { + "__type__": "cc.Vec2", + "x": 2048, + "y": 2048 + } + }, + { + "__type__": "cc.SkyboxInfo", + "_envLightingType": 1, + "_envmapHDR": { + "__uuid__": "d032ac98-05e1-4090-88bb-eb640dcb5fc1@b47c0", + "__expectedType__": "cc.TextureCube" + }, + "_envmap": { + "__uuid__": "d032ac98-05e1-4090-88bb-eb640dcb5fc1@b47c0", + "__expectedType__": "cc.TextureCube" + }, + "_envmapLDR": { + "__uuid__": "6f01cf7f-81bf-4a7e-bd5d-0afc19696480@b47c0", + "__expectedType__": "cc.TextureCube" + }, + "_diffuseMapHDR": null, + "_diffuseMapLDR": null, + "_enabled": true, + "_useHDR": true, + "_editableMaterial": null, + "_reflectionHDR": null, + "_reflectionLDR": null, + "_rotationAngle": 0 + }, + { + "__type__": "cc.FogInfo", + "_type": 0, + "_fogColor": { + "__type__": "cc.Color", + "r": 200, + "g": 200, + "b": 200, + "a": 255 + }, + "_enabled": false, + "_fogDensity": 0.3, + "_fogStart": 0.5, + "_fogEnd": 300, + "_fogAtten": 5, + "_fogTop": 1.5, + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.OctreeInfo", + "_enabled": false, + "_minPos": { + "__type__": "cc.Vec3", + "x": -1024, + "y": -1024, + "z": -1024 + }, + "_maxPos": { + "__type__": "cc.Vec3", + "x": 1024, + "y": 1024, + "z": 1024 + }, + "_depth": 8 + }, + { + "__type__": "cc.LightProbeInfo", + "_enabled": false, + "_giScale": 1, + "_giSamples": 1024, + "_bounces": 2, + "_reduceRinging": 0, + "_showProbe": true, + "_showWireframe": true, + "_lightProbeSphereVolume": 1, + "_showConvex": false, + "_data": null, + "_lightProbeGroups": [] + }, + { + "__type__": "cc.SkinInfo", + "_enabled": false, + "_scale": 5 + } +] \ No newline at end of file diff --git a/editor/assets/default_file_content/scene-quality.meta b/editor/assets/default_file_content/scene/scene-quality.scene.meta similarity index 75% rename from editor/assets/default_file_content/scene-quality.meta rename to editor/assets/default_file_content/scene/scene-quality.scene.meta index cc1028935a9..8f08c7f7fbf 100644 --- a/editor/assets/default_file_content/scene-quality.meta +++ b/editor/assets/default_file_content/scene/scene-quality.scene.meta @@ -1,10 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.1.48", + "importer": "scene", "imported": true, "uuid": "1d5e3139-1826-4b4a-8c4c-2e7b6874a474", "files": [ - "", ".json" ], "subMetas": {}, diff --git a/editor/assets/default_file_content/stg b/editor/assets/default_file_content/stg deleted file mode 100644 index d098c0bba46..00000000000 --- a/editor/assets/default_file_content/stg +++ /dev/null @@ -1,7 +0,0 @@ -{ - "__type__": "RenderStage", - "_name": "", - "_objFlags": 0, - "_native": "", - "renderStage": null -} \ No newline at end of file diff --git a/editor/assets/default_file_content/stg.meta b/editor/assets/default_file_content/stg.meta deleted file mode 100644 index 59b9e75ad8e..00000000000 --- a/editor/assets/default_file_content/stg.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "e7e9f9b7-58f3-44b4-b31c-7e7b0f601e92", - "files": [ - "", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/editor/assets/default_file_content/terrain.meta b/editor/assets/default_file_content/terrain.meta index 729a4cd9070..252e879c927 100644 --- a/editor/assets/default_file_content/terrain.meta +++ b/editor/assets/default_file_content/terrain.meta @@ -1,12 +1,9 @@ { - "ver": "1.0.0", - "importer": "*", + "ver": "1.2.0", + "importer": "directory", "imported": true, - "uuid": "c3dd770e-f74d-491f-85f7-4607add32858", - "files": [ - "", - ".json" - ], + "uuid": "8ac89515-f5db-4cf9-b1e0-3f5155c30b81", + "files": [], "subMetas": {}, "userData": {} } diff --git a/editor/assets/default_file_content/terrain b/editor/assets/default_file_content/terrain/default.terrain similarity index 100% rename from editor/assets/default_file_content/terrain rename to editor/assets/default_file_content/terrain/default.terrain diff --git a/editor/assets/default_file_content/terrain/default.terrain.meta b/editor/assets/default_file_content/terrain/default.terrain.meta new file mode 100644 index 00000000000..f0f5d5edf21 --- /dev/null +++ b/editor/assets/default_file_content/terrain/default.terrain.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.48", + "importer": "terrain", + "imported": true, + "uuid": "c3dd770e-f74d-491f-85f7-4607add32858", + "files": [ + ".bin", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/typescript.meta b/editor/assets/default_file_content/typescript.meta new file mode 100644 index 00000000000..aa157b30fe2 --- /dev/null +++ b/editor/assets/default_file_content/typescript.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "6a9f0a5f-bde7-4fa7-b3ee-805461712adc", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/editor/assets/default_file_content/ts b/editor/assets/default_file_content/typescript/ts similarity index 100% rename from editor/assets/default_file_content/ts rename to editor/assets/default_file_content/typescript/ts diff --git a/editor/assets/default_file_content/ts.meta b/editor/assets/default_file_content/typescript/ts.meta similarity index 100% rename from editor/assets/default_file_content/ts.meta rename to editor/assets/default_file_content/typescript/ts.meta