mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
profiler with surface transform (#10515)
* profiler with surface transform * add namespace closing comment
This commit is contained in:
@@ -351,7 +351,7 @@ export class Mesh extends Asset {
|
||||
const vertexBundle = this._struct.vertexBundles[i];
|
||||
const vertexBuffer = device.createBuffer(new BufferInfo(
|
||||
BufferUsageBit.VERTEX | BufferUsageBit.TRANSFER_DST,
|
||||
MemoryUsageBit.DEVICE | MemoryUsageBit.HOST,
|
||||
MemoryUsageBit.DEVICE,
|
||||
vertexBundle.view.length,
|
||||
vertexBundle.view.stride,
|
||||
));
|
||||
@@ -367,7 +367,7 @@ export class Mesh extends Asset {
|
||||
if (indexView) {
|
||||
indexBuffer = device.createBuffer(new BufferInfo(
|
||||
BufferUsageBit.INDEX | BufferUsageBit.TRANSFER_DST,
|
||||
MemoryUsageBit.DEVICE | MemoryUsageBit.HOST,
|
||||
MemoryUsageBit.DEVICE,
|
||||
indexView.length,
|
||||
indexView.stride,
|
||||
));
|
||||
|
||||
@@ -9,9 +9,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "billboard|vert:vs_main|tinted-fs:add",
|
||||
"hash": 1267104656,
|
||||
"hash": 1247932368,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 94, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 95, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -84,9 +84,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "debug-renderer|debug-renderer-vs:vert|debug-renderer-fs:frag",
|
||||
"hash": 294392904,
|
||||
"hash": 1278885212,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -121,9 +121,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "geometry-renderer|line-vs:vert|line-fs:front",
|
||||
"hash": 3617431000,
|
||||
"hash": 3619465454,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -144,9 +144,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "geometry-renderer|line-vs:vert|line-fs:back",
|
||||
"hash": 4168905198,
|
||||
"hash": 1057739685,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -167,9 +167,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "geometry-renderer|dashed-line-vs:vert|dashed-line-fs:front",
|
||||
"hash": 4034582016,
|
||||
"hash": 3439667104,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -190,9 +190,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "geometry-renderer|dashed-line-vs:vert|dashed-line-fs:back",
|
||||
"hash": 1762165009,
|
||||
"hash": 1998990011,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -213,9 +213,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "geometry-renderer|triangle-vs:vert|triangle-fs:front",
|
||||
"hash": 4143142643,
|
||||
"hash": 2829294556,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -237,9 +237,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "geometry-renderer|triangle-vs:vert|triangle-fs:back",
|
||||
"hash": 826026446,
|
||||
"hash": 990534784,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -269,9 +269,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "graphics|vs:vert|fs:frag",
|
||||
"hash": 818680106,
|
||||
"hash": 1153867153,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 89, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 90, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -301,9 +301,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "occlusion-query|occlusion-query-vs:vert|occlusion-query-fs:frag",
|
||||
"hash": 1571978323,
|
||||
"hash": 1316302916,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 41, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 42, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCWorldBound", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -329,9 +329,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "particle-gpu|particle-vs-gpu:gpvs_main|tinted-fs:add",
|
||||
"hash": 1492719419,
|
||||
"hash": 2908342715,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 104, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 105, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -422,9 +422,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "particle-trail|particle-trail:vs_main|tinted-fs:add",
|
||||
"hash": 2681867487,
|
||||
"hash": 2383326777,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 93, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 94, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -471,9 +471,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "particle|particle-vs-legacy:lpvs_main|tinted-fs:add",
|
||||
"hash": 714317392,
|
||||
"hash": 3069800943,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 93, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 94, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -523,9 +523,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "spine|sprite-vs:vert|sprite-fs:frag",
|
||||
"hash": 1713049466,
|
||||
"hash": 1399112036,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 89, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 90, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_LOCAL", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["USE_LOCAL"] }], "samplerTextures": [{ "name": "cc_spriteTexture", "defines": [] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -563,9 +563,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "sprite|sprite-vs:vert|sprite-fs:frag",
|
||||
"hash": 528700848,
|
||||
"hash": 1764412377,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 89, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 90, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 1 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_LOCAL", "USE_BATCHING"] }, { "name": "CCLocal", "defines": ["USE_LOCAL"] }], "samplerTextures": [{ "name": "cc_spriteTexture", "defines": ["USE_TEXTURE"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -606,9 +606,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "standard|standard-vs|standard-fs",
|
||||
"hash": 1937716204,
|
||||
"hash": 2787037684,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 223, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 115 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 224, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 116 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }, { "name": "cc_diffuseMap", "defines": ["CC_USE_DIFFUSEMAP"] }], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -699,9 +699,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "standard|shadow-caster-vs:vert|shadow-caster-fs:frag",
|
||||
"hash": 3038657594,
|
||||
"hash": 940999477,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 184, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 115 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 184, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 116 },
|
||||
"globals": { "blocks": [{ "name": "CCShadow", "defines": [] }, { "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -770,9 +770,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "terrain|terrain-vs|terrain-fs",
|
||||
"hash": 3377788356,
|
||||
"hash": 3988161031,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 111, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 111 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 112, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 112 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }, { "name": "cc_diffuseMap", "defines": ["CC_USE_DIFFUSEMAP"] }], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }, { "name": "CCForwardLight", "defines": ["CC_FORWARD_ADD", "CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [{ "name": "cc_lightingMap", "defines": ["USE_LIGHTMAP", "!USE_BATCHING", "!CC_FORWARD_ADD"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -833,9 +833,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "terrain|shadow-caster-vs:vert|shadow-caster-fs:frag",
|
||||
"hash": 182319298,
|
||||
"hash": 750980113,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 109, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 110, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 0 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -865,9 +865,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "unlit|unlit-vs:vert|unlit-fs:frag",
|
||||
"hash": 3763836392,
|
||||
"hash": 2252984662,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 198, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 199, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 42 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -938,9 +938,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "bloom|bloom-vs|prefilter-fs",
|
||||
"hash": 1694283355,
|
||||
"hash": 2215658601,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 148, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -990,9 +990,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "bloom|bloom-vs|downsample-fs",
|
||||
"hash": 546996885,
|
||||
"hash": 1468681414,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 148, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1042,9 +1042,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "bloom|bloom-vs|upsample-fs",
|
||||
"hash": 4202381467,
|
||||
"hash": 2548591363,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 148, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1094,9 +1094,9 @@ export const effects = [
|
||||
},
|
||||
{
|
||||
"name": "bloom|bloom-vs|combine-fs",
|
||||
"hash": 1033011508,
|
||||
"hash": 935456793,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 148, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 41 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1155,9 +1155,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "deferred-lighting|lighting-vs|lighting-fs",
|
||||
"hash": 4169577096,
|
||||
"hash": 3489372209,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 109 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 110 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }, { "name": "cc_diffuseMap", "defines": ["CC_USE_DIFFUSEMAP"] }], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }, { "name": "CCForwardLight", "defines": ["CC_ENABLE_CLUSTERED_LIGHT_CULLING"] }], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1220,9 +1220,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "planar-shadow|planar-shadow-vs:vert|planar-shadow-fs:frag",
|
||||
"hash": 3508735230,
|
||||
"hash": 3028463380,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 217, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 59 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 218, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 60 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }, { "name": "CCLocalBatched", "defines": ["USE_BATCHING"] }, { "name": "CCLocal", "defines": [] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1274,9 +1274,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "post-process|post-process-vs|post-process-fs",
|
||||
"hash": 3459002230,
|
||||
"hash": 420584237,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 147, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 148, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [{ "name": "CCMorph", "defines": ["CC_USE_MORPH"] }, { "name": "CCSkinningTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinningAnimation", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }, { "name": "CCSkinning", "defines": ["CC_USE_SKINNING", "!CC_USE_BAKED_ANIMATION"] }], "samplerTextures": [{ "name": "cc_PositionDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_POSITION"] }, { "name": "cc_NormalDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_NORMAL"] }, { "name": "cc_TangentDisplacements", "defines": ["CC_USE_MORPH", "CC_MORPH_TARGET_HAS_TANGENT"] }, { "name": "cc_jointTexture", "defines": ["CC_USE_SKINNING", "CC_USE_BAKED_ANIMATION"] }], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1331,9 +1331,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "skybox|sky-vs:vert|sky-fs:frag",
|
||||
"hash": 3078878888,
|
||||
"hash": 3739887706,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 39, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 40, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [{ "name": "cc_environment", "defines": [] }], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
@@ -1381,9 +1381,9 @@ export const effects = [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "profiler|profiler-vs:vert|profiler-fs:frag",
|
||||
"hash": 179162168,
|
||||
"hash": 1980486553,
|
||||
"builtins": {
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 60, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 39 },
|
||||
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 61, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 40 },
|
||||
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }], "samplerTextures": [], "buffers": [], "images": [] },
|
||||
"locals": { "blocks": [], "samplerTextures": [], "buffers": [], "images": [] }
|
||||
},
|
||||
|
||||
@@ -14,7 +14,7 @@ export const glsl1 = [
|
||||
],
|
||||
[
|
||||
{
|
||||
"vert": "\nprecision mediump float;\nuniform mediump vec4 cc_screenSize;\nuniform highp vec4 cc_cameraPos;\n#define PI 3.14159265359\n#define PI2 6.28318530718\n#define EPSILON 1e-6\n#define LOG2 1.442695\n#define FP_MAX 65504.0\n#define FP_SCALE 0.0009765625\n#define FP_SCALE_INV 1024.0\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\nvarying vec2 v_texCoord;\nvarying vec4 v_color;\nvec4 vert () {\nvec2 position = a_position * cc_screenSize.zw;\nposition = position * vec2(2.0, -2.0) + vec2(-1.0, 1.0);\nposition = cc_cameraPos.w == 0.0 ? vec2(position.x, -position.y) : position;\nv_texCoord = a_texCoord;\nv_color = a_color;\nreturn vec4(position, 0.0, 1.0);\n}\nvoid main() { gl_Position = vert(); }",
|
||||
"vert": "\nprecision mediump float;\nuniform mediump vec4 cc_screenSize;\nuniform highp vec4 cc_cameraPos;\nuniform mediump vec4 cc_surfaceTransform;\n#define PI 3.14159265359\n#define PI2 6.28318530718\n#define EPSILON 1e-6\n#define LOG2 1.442695\n#define FP_MAX 65504.0\n#define FP_SCALE 0.0009765625\n#define FP_SCALE_INV 1024.0\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\nvarying vec2 v_texCoord;\nvarying vec4 v_color;\nvec4 vert () {\nint orientation = int(cc_surfaceTransform.x);\nvec4 transform = vec4(1.0, 0.0, 0.0, 1.0);\nif (orientation == 0) {\ntransform = vec4(1.0, 0.0, 0.0, 1.0);\n} else if (orientation == 1) {\ntransform = vec4(0.0, 1.0, -1.0, 0.0);\n} else if (orientation == 2) {\ntransform = vec4(-1.0, 0.0, 0.0, -1.0);\n} else if (orientation == 3) {\ntransform = vec4(0.0, -1.0, 1.0, 0.0);\n}\nvec2 invScreenSize = (orientation == 1 || orientation == 3) ? cc_screenSize.wz : cc_screenSize.zw;\nvec2 position = a_position * invScreenSize;\nposition = position * vec2(2.0, -2.0) + vec2(-1.0, 1.0);\nvec2 clipPos = vec2(dot(transform.xy, position), dot(transform.zw, position));\nclipPos = cc_cameraPos.w == 0.0 ? vec2(clipPos.x, -clipPos.y) : clipPos;\nv_texCoord = a_texCoord;\nv_color = a_color;\nreturn vec4(clipPos, 0.0, 1.0);\n}\nvoid main() { gl_Position = vert(); }",
|
||||
"frag": "\nprecision mediump float;\nvec4 CCFragOutput (vec4 color) {\nreturn color;\n}\nvarying vec2 v_texCoord;\nvarying vec4 v_color;\nuniform sampler2D mainTexture;\nvec4 frag () {\nvec4 color = vec4(v_color.rgb, v_color.a * texture2D(mainTexture, v_texCoord).r);\nreturn CCFragOutput(color);\n}\nvoid main() { gl_FragColor = frag(); }",
|
||||
}
|
||||
],
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -348,6 +348,7 @@ export class WebDescriptorHierarchy extends DescriptorHierarchy {
|
||||
this.setUniform(cameraDB, 'cc_matViewProj', Type.MAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_matViewProjInv', Type.MAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_cameraPos', Type.FLOAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_surfaceTransform', Type.FLOAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_screenScale', Type.FLOAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_exposure', Type.FLOAT4, 1);
|
||||
this.setUniform(cameraDB, 'cc_mainLitDir', Type.FLOAT4, 1);
|
||||
|
||||
@@ -77,6 +77,7 @@ function setCameraValues (setter: Setter,
|
||||
setter.setMat4('cc_matViewProj', camera.matViewProj);
|
||||
setter.setMat4('cc_matViewProjInv', camera.matViewProjInv);
|
||||
setter.setVec4('cc_cameraPos', new Vec4(camera.position.x, camera.position.y, camera.position.z, 0.0));
|
||||
setter.setVec4('cc_surfaceTransform', new Vec4(camera.surfaceTransform, 0.0, 0.0, 0.0));
|
||||
setter.setVec4('cc_screenScale', new Vec4(cfg.shadingScale, cfg.shadingScale, 1.0 / cfg.shadingScale, 1.0 / cfg.shadingScale));
|
||||
setter.setVec4('cc_exposure', new Vec4(camera.exposure, 1.0 / camera.exposure, cfg.isHDR ? 1.0 : 0.0, 0.0));
|
||||
|
||||
|
||||
@@ -206,7 +206,8 @@ export class UBOCamera {
|
||||
public static readonly MAT_VIEW_PROJ_OFFSET = UBOCamera.MAT_PROJ_INV_OFFSET + 16;
|
||||
public static readonly MAT_VIEW_PROJ_INV_OFFSET = UBOCamera.MAT_VIEW_PROJ_OFFSET + 16;
|
||||
public static readonly CAMERA_POS_OFFSET = UBOCamera.MAT_VIEW_PROJ_INV_OFFSET + 16;
|
||||
public static readonly SCREEN_SCALE_OFFSET = UBOCamera.CAMERA_POS_OFFSET + 4;
|
||||
public static readonly SURFACE_TRANSFORM_OFFSET = UBOCamera.CAMERA_POS_OFFSET + 4;
|
||||
public static readonly SCREEN_SCALE_OFFSET = UBOCamera.SURFACE_TRANSFORM_OFFSET + 4;
|
||||
public static readonly EXPOSURE_OFFSET = UBOCamera.SCREEN_SCALE_OFFSET + 4;
|
||||
public static readonly MAIN_LIT_DIR_OFFSET = UBOCamera.EXPOSURE_OFFSET + 4;
|
||||
public static readonly MAIN_LIT_COLOR_OFFSET = UBOCamera.MAIN_LIT_DIR_OFFSET + 4;
|
||||
@@ -231,6 +232,7 @@ export class UBOCamera {
|
||||
new Uniform('cc_matViewProj', Type.MAT4, 1),
|
||||
new Uniform('cc_matViewProjInv', Type.MAT4, 1),
|
||||
new Uniform('cc_cameraPos', Type.FLOAT4, 1),
|
||||
new Uniform('cc_surfaceTransform', Type.FLOAT4, 1),
|
||||
new Uniform('cc_screenScale', Type.FLOAT4, 1),
|
||||
new Uniform('cc_exposure', Type.FLOAT4, 1),
|
||||
new Uniform('cc_mainLitDir', Type.FLOAT4, 1),
|
||||
|
||||
@@ -141,6 +141,8 @@ export class PipelineUBO {
|
||||
Mat4.toArray(cv, camera.matViewProjInv, UBOCamera.MAT_VIEW_PROJ_INV_OFFSET);
|
||||
cv[UBOCamera.CAMERA_POS_OFFSET + 3] = this.getCombineSignY();
|
||||
|
||||
cv[UBOCamera.SURFACE_TRANSFORM_OFFSET] = camera.surfaceTransform;
|
||||
|
||||
const colorTempRGB = fog.colorArray;
|
||||
cv[UBOCamera.GLOBAL_FOG_COLOR_OFFSET] = colorTempRGB.x;
|
||||
cv[UBOCamera.GLOBAL_FOG_COLOR_OFFSET + 1] = colorTempRGB.y;
|
||||
|
||||
@@ -386,6 +386,10 @@ export class Camera {
|
||||
return this._farClip;
|
||||
}
|
||||
|
||||
get surfaceTransform() {
|
||||
return this._curTransform;
|
||||
}
|
||||
|
||||
set clearColor (val) {
|
||||
this._clearColor.x = val.x;
|
||||
this._clearColor.y = val.y;
|
||||
|
||||
@@ -18,6 +18,7 @@ layout(set = 0, binding = 1) uniform CCCamera {
|
||||
highp mat4 cc_matViewProj; // view-projection matrix
|
||||
highp mat4 cc_matViewProjInv; // inverse view-projection matrix
|
||||
highp vec4 cc_cameraPos; // xyz: camera position
|
||||
mediump vec4 cc_surfaceTransform; // x: surface transform
|
||||
mediump vec4 cc_screenScale; // xy: screen scale, zw: inverse screen scale
|
||||
mediump vec4 cc_exposure; // x: exposure, y: inverse exposure, z: HDR flag, w: unused
|
||||
mediump vec4 cc_mainLitDir; // xyz: main direcitonal light direction, w: enable shadow
|
||||
|
||||
@@ -31,14 +31,30 @@ CCProgram debug-renderer-vs %{
|
||||
out vec4 v_color;
|
||||
|
||||
vec4 vert () {
|
||||
vec2 position = a_position * cc_screenSize.zw;
|
||||
int orientation = int(cc_surfaceTransform.x);
|
||||
vec4 transform = vec4(1.0, 0.0, 0.0, 1.0);
|
||||
|
||||
if (orientation == 0) {
|
||||
transform = vec4(1.0, 0.0, 0.0, 1.0);
|
||||
} else if (orientation == 1) {
|
||||
transform = vec4(0.0, 1.0, -1.0, 0.0);
|
||||
} else if (orientation == 2) {
|
||||
transform = vec4(-1.0, 0.0, 0.0, -1.0);
|
||||
} else if (orientation == 3) {
|
||||
transform = vec4(0.0, -1.0, 1.0, 0.0);
|
||||
}
|
||||
|
||||
vec2 invScreenSize = (orientation == 1 || orientation == 3) ? cc_screenSize.wz : cc_screenSize.zw;
|
||||
vec2 position = a_position * invScreenSize;
|
||||
position = position * vec2(2.0, -2.0) + vec2(-1.0, 1.0);
|
||||
CC_HANDLE_GET_CLIP_FLIP(position);
|
||||
|
||||
vec2 clipPos = vec2(dot(transform.xy, position), dot(transform.zw, position));
|
||||
CC_HANDLE_GET_CLIP_FLIP(clipPos);
|
||||
|
||||
v_texCoord = a_texCoord;
|
||||
v_color = a_color;
|
||||
|
||||
return vec4(position, 0.0, 1.0);
|
||||
return vec4(clipPos, 0.0, 1.0);
|
||||
}
|
||||
}%
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"ver": "2.1.10",
|
||||
"ver": "2.1.11",
|
||||
"importer": "fbx",
|
||||
"imported": true,
|
||||
"uuid": "1263d74c-8167-4928-91a6-4e2672411f47",
|
||||
|
||||
@@ -230,7 +230,7 @@ void Mesh::initialize() {
|
||||
|
||||
for (const auto &vertexBundle : _struct.vertexBundles) {
|
||||
auto *vertexBuffer = device->createBuffer({gfx::BufferUsageBit::VERTEX | gfx::BufferUsageBit::TRANSFER_DST,
|
||||
gfx::MemoryUsageBit::DEVICE | gfx::MemoryUsageBit::HOST,
|
||||
gfx::MemoryUsageBit::DEVICE,
|
||||
vertexBundle.view.length,
|
||||
vertexBundle.view.stride});
|
||||
vertexBuffers.emplace_back(vertexBuffer);
|
||||
@@ -243,7 +243,7 @@ void Mesh::initialize() {
|
||||
|
||||
if (indexView.has_value()) {
|
||||
indexBuffer = device->createBuffer({gfx::BufferUsageBit::INDEX | gfx::BufferUsageBit::TRANSFER_DST,
|
||||
gfx::MemoryUsageBit::DEVICE | gfx::MemoryUsageBit::HOST,
|
||||
gfx::MemoryUsageBit::DEVICE,
|
||||
indexView.value().length,
|
||||
indexView.value().stride});
|
||||
}
|
||||
|
||||
@@ -30,100 +30,99 @@ namespace cc {
|
||||
|
||||
// absolute essential effects
|
||||
const GzipedString BUILTIN_EFFECTS {
|
||||
"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"
|
||||
"3x6ooMwCAA=="
|
||||
"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"
|
||||
};
|
||||
} // namespace cc
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -113,6 +113,7 @@ const gfx::UniformBlock UBOCamera::LAYOUT = {
|
||||
{"cc_matViewProj", gfx::Type::MAT4, 1},
|
||||
{"cc_matViewProjInv", gfx::Type::MAT4, 1},
|
||||
{"cc_cameraPos", gfx::Type::FLOAT4, 1},
|
||||
{"cc_surfaceTransform", gfx::Type::FLOAT4, 1},
|
||||
{"cc_screenScale", gfx::Type::FLOAT4, 1},
|
||||
{"cc_exposure", gfx::Type::FLOAT4, 1},
|
||||
{"cc_mainLitDir", gfx::Type::FLOAT4, 1},
|
||||
|
||||
@@ -425,7 +425,8 @@ struct CC_DLL UBOCamera {
|
||||
static constexpr uint MAT_VIEW_PROJ_OFFSET = UBOCamera::MAT_PROJ_INV_OFFSET + 16;
|
||||
static constexpr uint MAT_VIEW_PROJ_INV_OFFSET = UBOCamera::MAT_VIEW_PROJ_OFFSET + 16;
|
||||
static constexpr uint CAMERA_POS_OFFSET = UBOCamera::MAT_VIEW_PROJ_INV_OFFSET + 16;
|
||||
static constexpr uint SCREEN_SCALE_OFFSET = UBOCamera::CAMERA_POS_OFFSET + 4;
|
||||
static constexpr uint SURFACE_TRANSFORM_OFFSET = UBOCamera::CAMERA_POS_OFFSET + 4;
|
||||
static constexpr uint SCREEN_SCALE_OFFSET = UBOCamera::SURFACE_TRANSFORM_OFFSET + 4;
|
||||
static constexpr uint EXPOSURE_OFFSET = UBOCamera::SCREEN_SCALE_OFFSET + 4;
|
||||
static constexpr uint MAIN_LIT_DIR_OFFSET = UBOCamera::EXPOSURE_OFFSET + 4;
|
||||
static constexpr uint MAIN_LIT_COLOR_OFFSET = UBOCamera::MAIN_LIT_DIR_OFFSET + 4;
|
||||
|
||||
@@ -162,6 +162,8 @@ void PipelineUBO::updateCameraUBOView(const RenderPipeline *pipeline, float *out
|
||||
memcpy(output + UBOCamera::MAT_VIEW_PROJ_INV_OFFSET, camera->getMatViewProjInv().m, sizeof(cc::Mat4));
|
||||
output[UBOCamera::CAMERA_POS_OFFSET + 3] = getCombineSignY();
|
||||
|
||||
output[UBOCamera::SURFACE_TRANSFORM_OFFSET + 0] = static_cast<float>(camera->getSurfaceTransform());
|
||||
|
||||
if (fog != nullptr) {
|
||||
const auto &colorTempRGB = fog->getColorArray();
|
||||
output[UBOCamera::GLOBAL_FOG_COLOR_OFFSET] = colorTempRGB.x;
|
||||
|
||||
@@ -310,6 +310,8 @@ public:
|
||||
inline float getScreenScale() const { return _screenScale; }
|
||||
inline void setScreenScale(float val) { _screenScale = val; }
|
||||
|
||||
inline gfx::SurfaceTransform getSurfaceTransform() const { return _curTransform; }
|
||||
|
||||
inline pipeline::GeometryRenderer *getGeometryRenderer() const { return _geometryRenderer.get(); }
|
||||
|
||||
void detachCamera();
|
||||
|
||||
@@ -102,7 +102,7 @@ getter_setter = Root::[device:_device mainWindow curWindow tempWindow windows sc
|
||||
DirectionalLight::[direction illuminance illuminanceHDR illuminanceLDR shadowEnabled/isShadowEnabled shadowPcf shadowBias shadowNormalBias shadowSaturation shadowDistance shadowInvisibleOcclusionRange shadowFixedArea/isShadowFixedArea shadowNear shadowFar shadowOrthoSize],
|
||||
SpotLight::[position size range luminance luminanceHDR luminanceLDR direction spotAngle angle aspect aabb/getAABB frustum shadowEnabled/isShadowEnabled shadowPcf shadowBias shadowNormalBias],
|
||||
SphereLight::[position size range luminance luminanceHDR luminanceLDR aabb/getAABB],
|
||||
Camera::[iso isoValue ec exposure shutter shutterValue apertureValue width height aspect matView matProj matProjInv matViewProj matViewProjInv scene name window forward aperture position projectionType/getProjectionType/setProjectionType fovAxis fov nearClip farClip viewport orthoHeight clearColor clearDepth clearFlag clearStencil enabled/isEnabled/setEnabled exposure frustum isWindowSize/isWindowSize/setWindowSize priority screenScale visibility node geometryRenderer],
|
||||
Camera::[iso isoValue ec exposure shutter shutterValue apertureValue width height aspect matView matProj matProjInv matViewProj matViewProjInv scene name window forward aperture position projectionType/getProjectionType/setProjectionType fovAxis fov nearClip farClip viewport orthoHeight clearColor clearDepth clearFlag clearStencil enabled/isEnabled/setEnabled exposure frustum isWindowSize/isWindowSize/setWindowSize priority screenScale visibility node surfaceTransform geometryRenderer],
|
||||
RenderScene::[name cameras? mainLight? sphereLights? spotLights? models],
|
||||
Skybox::[model enabled/isEnabled/setEnabled useIBL/isUseIBL/setUseIBL isRGBE/isRGBE/setRGBE envmap],
|
||||
Fog::[enabled/isEnabled/setEnabled fogColor type fogDensity fogStart fogEnd fogAtten fogTop fogRange fogRange colorArray],
|
||||
|
||||
Reference in New Issue
Block a user