Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

feat: make boneMatrix 4x3 from 4x4 #1289

Merged
merged 1 commit into from
Aug 19, 2023
Merged

feat: make boneMatrix 4x3 from 4x4 #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/test_e2e/GltfImporter-skinning-mat44/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ declare const window: any;
const p = document.createElement('p');
document.body.appendChild(p);

Rn.Config.boneDataType = Rn.BoneDataType.Mat44x1;
Rn.Config.boneDataType = Rn.BoneDataType.Mat43x1;
Rn.Config.maxSkeletalBoneNumber = 2;
await Rn.System.init({
approach: Rn.ProcessApproach.Uniform,
Expand Down
41 changes: 21 additions & 20 deletions src/foundation/components/Skeletal/SkeletalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class SkeletalComponent extends Component {
}

if (SkeletalComponent.__tookGlobalDataNum < Config.maxSkeletonNumber) {
if (Config.boneDataType === BoneDataType.Mat44x1) {
if (Config.boneDataType === BoneDataType.Mat43x1) {
SkeletalComponent.__globalDataRepository.takeOne(ShaderSemantics.BoneMatrix);
} else if (Config.boneDataType === BoneDataType.Vec4x2) {
SkeletalComponent.__globalDataRepository.takeOne(ShaderSemantics.BoneTranslatePackedQuat);
Expand Down Expand Up @@ -101,7 +101,7 @@ export class SkeletalComponent extends Component {
if (this.componentSID < Config.maxSkeletonNumber) {
index = this.componentSID;
}
if (Config.boneDataType === BoneDataType.Mat44x1) {
if (Config.boneDataType === BoneDataType.Mat43x1) {
this.__matArray = SkeletalComponent.__globalDataRepository.getValue(
ShaderSemantics.BoneMatrix,
index
Expand Down Expand Up @@ -228,13 +228,13 @@ export class SkeletalComponent extends Component {
this.__isWorldMatrixVanilla = false;

if (
Config.boneDataType === BoneDataType.Mat44x1 ||
Config.boneDataType === BoneDataType.Mat43x1 ||
Config.boneDataType === BoneDataType.Vec4x1
) {
this.__copyToMatArray(m, i);
}

if (Config.boneDataType !== BoneDataType.Mat44x1) {
if (Config.boneDataType !== BoneDataType.Mat43x1) {
const scaleVec = SkeletalComponent.__tmpVec3_0.setComponents(
Math.hypot(m.m00, m.m01, m.m02),
Math.hypot(m.m10, m.m11, m.m12),
Expand Down Expand Up @@ -369,22 +369,23 @@ export class SkeletalComponent extends Component {
}

private __copyToMatArray(m: IMatrix44, i: Index) {
this.__matArray[i * 16 + 0] = m._v[0];
this.__matArray[i * 16 + 1] = m._v[1];
this.__matArray[i * 16 + 2] = m._v[2];
this.__matArray[i * 16 + 3] = m._v[3];
this.__matArray[i * 16 + 4] = m._v[4];
this.__matArray[i * 16 + 5] = m._v[5];
this.__matArray[i * 16 + 6] = m._v[6];
this.__matArray[i * 16 + 7] = m._v[7];
this.__matArray[i * 16 + 8] = m._v[8];
this.__matArray[i * 16 + 9] = m._v[9];
this.__matArray[i * 16 + 10] = m._v[10];
this.__matArray[i * 16 + 11] = m._v[11];
this.__matArray[i * 16 + 12] = m._v[12];
this.__matArray[i * 16 + 13] = m._v[13];
this.__matArray[i * 16 + 14] = m._v[14];
this.__matArray[i * 16 + 15] = m._v[15];
// 0 1 2 3
// 4 5 6 7
// 8 9 10 11
// 12 13 14 15

this.__matArray[i * 12 + 0] = m._v[0];
this.__matArray[i * 12 + 1] = m._v[1];
this.__matArray[i * 12 + 2] = m._v[2];
this.__matArray[i * 12 + 3] = m._v[4];
this.__matArray[i * 12 + 4] = m._v[5];
this.__matArray[i * 12 + 5] = m._v[6];
this.__matArray[i * 12 + 6] = m._v[8];
this.__matArray[i * 12 + 7] = m._v[9];
this.__matArray[i * 12 + 8] = m._v[10];
this.__matArray[i * 12 + 9] = m._v[12];
this.__matArray[i * 12 + 10] = m._v[13];
this.__matArray[i * 12 + 11] = m._v[14];
}

public getInverseBindMatricesAccessor(): Accessor | undefined {
Expand Down
2 changes: 1 addition & 1 deletion src/foundation/core/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let maxSkeletalBoneNumber = 300;
let maxSkeletalBoneNumberForUniformMode = 50; // For Uniform Mode
let dataTextureWidth = Math.pow(2, 12);
let dataTextureHeight = Math.pow(2, 12);
let boneDataType = BoneDataType.Mat44x1;
let boneDataType = BoneDataType.Mat43x1;
let noWebGLTex2DStateCache = false;
let maxMorphTargetNumber = 4;
let totalSizeOfGPUShaderDataStorageExceptMorphData = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/foundation/core/GlobalDataRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class GlobalDataRepository {
// Skinning
const boneMatrixInfo = {
semantic: ShaderSemantics.BoneMatrix,
compositionType: CompositionType.Mat4Array,
compositionType: CompositionType.Mat4x3Array,
arrayLength: maxSkeletalBoneNumber,
componentType: ComponentType.Float,
stage: ShaderType.VertexShader,
Expand Down Expand Up @@ -210,7 +210,7 @@ export class GlobalDataRepository {
updateInterval: ShaderVariableUpdateInterval.EveryTime,
initialValue: Scalar.fromCopyNumber(-1),
};
if (Config.boneDataType === BoneDataType.Mat44x1) {
if (Config.boneDataType === BoneDataType.Mat43x1) {
this.__registerProperty(boneMatrixInfo, Config.maxSkeletonNumber);
} else if (Config.boneDataType === BoneDataType.Vec4x2) {
this.__registerProperty(boneTranslatePackedQuatInfo, Config.maxSkeletonNumber);
Expand Down
8 changes: 4 additions & 4 deletions src/foundation/definitions/BoneDataType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class BoneDataTypeClass extends EnumClass implements BoneDataTypeEnum {
}
}

const Mat44x1: BoneDataTypeEnum = new BoneDataTypeClass({
const Mat43x1: BoneDataTypeEnum = new BoneDataTypeClass({
index: 0,
str: 'Mat44x1',
str: 'Mat43x1',
});
const Vec4x2: BoneDataTypeEnum = new BoneDataTypeClass({
index: 1,
Expand All @@ -25,7 +25,7 @@ const Vec4x1: BoneDataTypeEnum = new BoneDataTypeClass({
str: 'Vec4x1',
});

const typeList = [Mat44x1, Vec4x2, Vec4x1];
const typeList = [Mat43x1, Vec4x2, Vec4x1];

function from(index: number): BoneDataTypeEnum {
return _from({ typeList, index }) as BoneDataTypeEnum;
Expand All @@ -36,7 +36,7 @@ function fromString(str: string): BoneDataTypeEnum {
}

export const BoneDataType = Object.freeze({
Mat44x1,
Mat43x1,
Vec4x2,
Vec4x2Old,
Vec4x1,
Expand Down
12 changes: 12 additions & 0 deletions src/foundation/definitions/CompositionType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,15 @@ const Texture2DRect: CompositionTypeEnum = new CompositionTypeClass({
numberOfComponents: 1,
vec4SizeOfProperty: 1,
});
const Mat4x3Array: CompositionTypeEnum = new CompositionTypeClass({
index: 18,
str: 'MAT4x3_ARRAY',
glslStr: 'mat4x3',
hlslStr: 'float4x3',
numberOfComponents: 12,
vec4SizeOfProperty: 3,
isArray: true,
});

const typeList = [
Unknown,
Expand All @@ -325,6 +334,7 @@ const typeList = [
Texture2DShadow,
Texture2DRect,
TextureCube,
Mat4x3Array,
];

export type VectorCompositionTypes = typeof Scalar | typeof Vec2 | typeof Vec3 | typeof Vec4;
Expand Down Expand Up @@ -486,6 +496,7 @@ function isArray(compositionType: CompositionTypeEnum) {
compositionType === Vec2Array ||
compositionType === Vec3Array ||
compositionType === Vec4Array ||
compositionType === Mat4x3Array ||
compositionType === Mat4Array ||
compositionType === Mat3Array ||
compositionType === Mat2Array
Expand Down Expand Up @@ -529,6 +540,7 @@ export const CompositionType = Object.freeze({
Texture2DShadow,
TextureCube,
Texture2DRect,
Mat4x3Array,
from,
fromString,
vectorFrom,
Expand Down
1 change: 1 addition & 0 deletions src/foundation/definitions/ShaderSemantics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ const getShaderProperty: getShaderPropertyFunc = (
`;
}
} else {
// is Not Array
str += `return u_${variableName};`;
}

Expand Down
4 changes: 2 additions & 2 deletions src/foundation/materials/core/AbstractMaterialContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@ export abstract class AbstractMaterialContent extends RnObject {
}
if (skeletalComponent) {
if (setUniform) {
if (Config.boneDataType === BoneDataType.Mat44x1) {
if (Config.boneDataType === BoneDataType.Mat43x1) {
const jointMatricesArray = skeletalComponent.jointMatricesArray;
(shaderProgram as any)._gl.uniformMatrix4fv(
(shaderProgram as any)._gl.uniformMatrix4x3fv(
(shaderProgram as any).boneMatrix,
false,
jointMatricesArray
Expand Down
2 changes: 1 addition & 1 deletion src/foundation/materials/core/ShaderHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export function _setupGlobalShaderDefinition(materialTypeName: string) {
if (glw.isWebGL2 || glw.webgl1ExtDRV) {
definitions += '#define RN_IS_SUPPORTING_STANDARD_DERIVATIVES\n';
}
if (Config.boneDataType === BoneDataType.Mat44x1) {
if (Config.boneDataType === BoneDataType.Mat43x1) {
definitions += '#define RN_BONE_DATA_TYPE_Mat44x1\n';
} else if (Config.boneDataType === BoneDataType.Vec4x2) {
definitions += '#define RN_BONE_DATA_TYPE_VEC4X2\n';
Expand Down
3 changes: 3 additions & 0 deletions src/webgl/WebGLStrategyDataTexture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ ${returnType} get_${methodName}(highp float _instanceId, const int idxOfArray) {
case CompositionType.Mat2Array:
str += ' mat2 val = fetchMat2No16BytesAligned(scalar_idx);\n';
break;
case CompositionType.Mat4x3Array:
str += ' mat4x3 val = fetchMat4x3(vec4_idx);\n';
break;
default:
// console.error('unknown composition type', info.compositionType.str, memberName);
str += '';
Expand Down
8 changes: 4 additions & 4 deletions src/webgl/shaderity_shaders/common/getSkinMatrix.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ highp vec4 unpackedVec2ToNormalizedVec4(highp vec2 vec_xy, highp float criteria)
mat4 getSkinMatrix(float skeletalComponentSID) {

#ifdef RN_BONE_DATA_TYPE_Mat44x1
mat4 skinMat = a_weight.x * get_boneMatrix(skeletalComponentSID, int(a_joint.x));
skinMat += a_weight.y * get_boneMatrix(skeletalComponentSID, int(a_joint.y));
skinMat += a_weight.z * get_boneMatrix(skeletalComponentSID, int(a_joint.z));
skinMat += a_weight.w * get_boneMatrix(skeletalComponentSID, int(a_joint.w));
mat4 skinMat = a_weight.x * mat4(get_boneMatrix(skeletalComponentSID, int(a_joint.x)));
skinMat += a_weight.y * mat4(get_boneMatrix(skeletalComponentSID, int(a_joint.y)));
skinMat += a_weight.z * mat4(get_boneMatrix(skeletalComponentSID, int(a_joint.z)));
skinMat += a_weight.w * mat4(get_boneMatrix(skeletalComponentSID, int(a_joint.w)));

#elif defined(RN_BONE_DATA_TYPE_VEC4X2)
vec2 criteria = vec2(4096.0, 4096.0);
Expand Down
12 changes: 12 additions & 0 deletions src/webgl/shaderity_shaders/common/prerequisites.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,18 @@ mat4 fetchMat4(int vec4_idx) {
return val;
}

mat4x3 fetchMat4x3(int vec4_idx) {
vec4 col0 = fetchElement(vec4_idx);
vec4 col1 = fetchElement(vec4_idx + 1);
vec4 col2 = fetchElement(vec4_idx + 2);

mat4x3 val = mat4x3(
col0.x, col0.y, col0.z, col0.w,
col1.x, col1.y, col1.z, col1.w,
col2.x, col2.y, col2.z, col2.w);
return val;
}

float rand(const vec2 co){
return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
}
Expand Down
Loading