|
@@ -82,9 +82,9 @@ export class ShaderMaterial extends Material {
|
|
private _vectors3: { [name: string]: Vector3 } = {};
|
|
private _vectors3: { [name: string]: Vector3 } = {};
|
|
private _vectors4: { [name: string]: Vector4 } = {};
|
|
private _vectors4: { [name: string]: Vector4 } = {};
|
|
private _matrices: { [name: string]: Matrix } = {};
|
|
private _matrices: { [name: string]: Matrix } = {};
|
|
- private _matrixArrays: { [name: string]: Float32Array } = {};
|
|
|
|
- private _matrices3x3: { [name: string]: Float32Array } = {};
|
|
|
|
- private _matrices2x2: { [name: string]: Float32Array } = {};
|
|
|
|
|
|
+ private _matrixArrays: { [name: string]: Float32Array | Array<number> } = {};
|
|
|
|
+ private _matrices3x3: { [name: string]: Float32Array | Array<number> } = {};
|
|
|
|
+ private _matrices2x2: { [name: string]: Float32Array | Array<number> } = {};
|
|
private _vectors2Arrays: { [name: string]: number[] } = {};
|
|
private _vectors2Arrays: { [name: string]: number[] } = {};
|
|
private _vectors3Arrays: { [name: string]: number[] } = {};
|
|
private _vectors3Arrays: { [name: string]: number[] } = {};
|
|
private _vectors4Arrays: { [name: string]: number[] } = {};
|
|
private _vectors4Arrays: { [name: string]: number[] } = {};
|
|
@@ -395,7 +395,7 @@ export class ShaderMaterial extends Material {
|
|
*/
|
|
*/
|
|
public setMatrix3x3(name: string, value: Float32Array | Array<number>): ShaderMaterial {
|
|
public setMatrix3x3(name: string, value: Float32Array | Array<number>): ShaderMaterial {
|
|
this._checkUniform(name);
|
|
this._checkUniform(name);
|
|
- this._matrices3x3[name] = Array.isArray(value) ? new Float32Array(value) : value;
|
|
|
|
|
|
+ this._matrices3x3[name] = value;
|
|
|
|
|
|
return this;
|
|
return this;
|
|
}
|
|
}
|
|
@@ -408,7 +408,7 @@ export class ShaderMaterial extends Material {
|
|
*/
|
|
*/
|
|
public setMatrix2x2(name: string, value: Float32Array | Array<number>): ShaderMaterial {
|
|
public setMatrix2x2(name: string, value: Float32Array | Array<number>): ShaderMaterial {
|
|
this._checkUniform(name);
|
|
this._checkUniform(name);
|
|
- this._matrices2x2[name] = Array.isArray(value) ? new Float32Array(value) : value;
|
|
|
|
|
|
+ this._matrices2x2[name] = value;
|
|
|
|
|
|
return this;
|
|
return this;
|
|
}
|
|
}
|