Skip to content

Commit

Permalink
Merge pull request cocos#49 from dumganhar/v3.3.0-native
Browse files Browse the repository at this point in the history 
Update ts files.
  • Loading branch information
@minggo
minggo committed Oct 27, 2021
2 parents ffba5ea + 01da12f commit 8b0fb7d
Show file tree
Hide file tree
Showing 7 changed files with 563 additions and 298 deletions.
20 changes: 14 additions & 6 deletions cocos/core/assets/asset.jsb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,26 @@
THE SOFTWARE.
*/

import { legacyCC } from "../global-exports";
import { js } from "../utils";
import { CallbacksInvoker } from "../event/callbacks-invoker";
import { legacyCC } from '../global-exports';
import { CallbacksInvoker } from '../event/callbacks-invoker';
import { applyMixins } from '../event/event-target-factory';
import { createMap } from "../utils/js-typed";

/**
* @param error - null or the error info
* @param node - the created node or null
*/
type CreateNodeCallback = (error: Error | null, node: Node) => void;
export type CreateNodeCallback = (error: Error | null, node: Node) => void;

js.mixin(jsb.Asset, CallbacksInvoker);
jsb.Asset.prototype.createNode = null!;
applyMixins(jsb.Asset, [CallbacksInvoker]);

const assetProto: any = jsb.Asset.prototype;

assetProto._ctor = function() {
this._callbackTable = createMap(true);
};

assetProto.createNode = null!;

export type Asset = jsb.Asset;
export const Asset = jsb.Asset;
Expand Down
162 changes: 160 additions & 2 deletions cocos/core/assets/material.jsb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ import { EffectAsset } from './effect-asset';
import { Texture } from '../gfx';
import { TextureBase } from './texture-base';
import { legacyCC } from '../global-exports';
import { PassOverrides } from '../renderer/core/pass';
import { MacroRecord, MaterialProperty, PropertyType } from '../renderer/core/pass-utils';
import { PassOverrides, MacroRecord, MaterialProperty } from '../renderer';

import { Color, Mat3, Mat4, Quat, Vec2, Vec3, Vec4 } from '../math';
import {wrap} from "yargs";

/**
* @en The basic infos for material initialization.
Expand Down Expand Up @@ -78,6 +80,162 @@ interface IMaterialInfo {

type MaterialPropertyFull = MaterialProperty | TextureBase | Texture | null;

const matProto: any = jsb.Material.prototype;

type setProperyCB = (name: string, val: MaterialPropertyFull | MaterialPropertyFull[], passIdx?: number) => void;
function wrapSetProperty(cb: setProperyCB, target: Material, name: string, val: MaterialPropertyFull | MaterialPropertyFull[], passIdx?: number) {
if (passIdx) {
cb.call(target, name, val, passIdx);
} else {
cb.call(target, name, val);
}
}

matProto.setProperty = function (name: string, val: MaterialPropertyFull | MaterialPropertyFull[], passIdx?: number) {
if (Array.isArray(val)) {
const first = val[0];
if (typeof first === 'number') {
if (Number.isInteger(first)) {
wrapSetProperty(this.setPropertyInt32Array, this, name, val, passIdx);
} else {
wrapSetProperty(this.setPropertyFloat32Array, this, name, val, passIdx);
}
} else if (first instanceof Vec2) {
wrapSetProperty(this.setPropertyVec2Array, this, name, val, passIdx);
} else if (first instanceof Vec3) {
wrapSetProperty(this.setPropertyVec3Array, this, name, val, passIdx);
} else if (first instanceof Vec4) {
wrapSetProperty(this.setPropertyVec4Array, this, name, val, passIdx);
} else if (first instanceof Color) {
wrapSetProperty(this.setPropertyColorArray, this, name, val, passIdx);
} else if (first instanceof Mat3) {
wrapSetProperty(this.setPropertyMat3Array, this, name, val, passIdx);
} else if (first instanceof Mat4) {
wrapSetProperty(this.setPropertyMat4Array, this, name, val, passIdx);
} else if (first instanceof Quat) {
wrapSetProperty(this.setPropertyQuatArray, this, name, val, passIdx);
} else if (first instanceof TextureBase) {
wrapSetProperty(this.setPropertyTextureBaseArray, this, name, val, passIdx);
} else if (first instanceof Texture) {
wrapSetProperty(this.setPropertyGFXTextureArray, this, name, val, passIdx);
} else {
legacyCC.error(`Material.setProperty Unknown type: ${val}`);
}
} else {
if (typeof val === 'number') {
if (Number.isInteger(val)) {
wrapSetProperty(this.setPropertyInt32, this, name, val, passIdx);
} else {
wrapSetProperty(this.setPropertyFloat32, this, name, val, passIdx);
}
} else if (val instanceof Vec2) {
wrapSetProperty(this.setPropertyVec2, this, name, val, passIdx);
} else if (val instanceof Vec3) {
wrapSetProperty(this.setPropertyVec3, this, name, val, passIdx);
} else if (val instanceof Vec4) {
wrapSetProperty(this.setPropertyVec4, this, name, val, passIdx);
} else if (val instanceof Color) {
wrapSetProperty(this.setPropertyColor, this, name, val, passIdx);
} else if (val instanceof Mat3) {
wrapSetProperty(this.setPropertyMat3, this, name, val, passIdx);
} else if (val instanceof Mat4) {
wrapSetProperty(this.setPropertyMat4, this, name, val, passIdx);
} else if (val instanceof Quat) {
wrapSetProperty(this.setPropertyQuat, this, name, val, passIdx);
} else if (val instanceof TextureBase) {
wrapSetProperty(this.setPropertyTextureBase, this, name, val, passIdx);
} else if (val instanceof Texture) {
wrapSetProperty(this.setPropertyGFXTexture, this, name, val, passIdx);
} else {
legacyCC.error(`Material.setProperty Unknown type: ${val}`);
}
}
};

matProto.getProperty = function (name: string, passIdx?: number) {
const val = this._getProperty(name, passIdx);
if (Array.isArray(val)) {
const first = val[0];
const arr = []; // cjh TODO: optimize temporary gc objects being created
if (first instanceof Vec2) {
for (let i = 0, len = val.length; i < len; ++i) {
const e = val[i];
arr.push(new Vec2(e.x, e.y));
}
} else if (first instanceof Vec3) {
for (let i = 0, len = val.length; i < len; ++i) {
const e = val[i];
arr.push(new Vec3(e.x, e.y, e.z));
}
} else if (first instanceof Vec4) {
for (let i = 0, len = val.length; i < len; ++i) {
const e = val[i];
arr.push(new Vec4(e.x, e.y, e.z, e.w));
}
} else if (first instanceof Color) {
for (let i = 0, len = val.length; i < len; ++i) {
const e = val[i];
arr.push(new Color(e.r, e.g, e.b, e.a));
}
} else if (first instanceof Mat3) {
for (let i = 0, len = val.length; i < len; ++i) {
const e = val[i];
arr.push(new Mat3(
e[0], e[1], e[2],
e[3], e[4], e[5],
e[6], e[7], e[8],
));
}
} else if (first instanceof Mat4) {
for (let i = 0, len = val.length; i < len; ++i) {
let e = val[i];
arr.push(new Mat4(
e[0], e[1], e[2], e[3],
e[4], e[5], e[6], e[7],
e[8], e[9], e[10], e[11],
e[12], e[13], e[14], e[15],
));
}
} else if (first instanceof Quat) {
for (let i = 0, len = val.length; i < len; ++i) {
let e = val[i];
arr.push(new Quat(e.x, e.y, e.z, e.w));
}
}

return arr ? arr : val;
}

let ret;
const e = val;
if (val instanceof Vec2) {
ret = new Vec3(e.x, e.y);
} else if (val instanceof Vec3) {
ret = new Vec3(e.x, e.y, e.z);
} else if (val instanceof Vec4) {
ret = new Vec4(e.x, e.y, e.z, e.w);
} else if (val instanceof Color) {
ret = new Color(e.r, e.g, e.b, e.a);
} else if (val instanceof Mat3) {
ret = new Mat3(
e[0], e[1], e[2],
e[3], e[4], e[5],
e[6], e[7], e[8],
);
} else if (val instanceof Mat4) {
ret = new Mat4(
e[0], e[1], e[2], e[3],
e[4], e[5], e[6], e[7],
e[8], e[9], e[10], e[11],
e[12], e[13], e[14], e[15],
);
} else if (val instanceof Quat) {
ret = new Quat(e.x, e.y, e.z, e.w);
}

return ret ? ret : val;
};

export type Material = jsb.Material;
export const Material = jsb.Material;

Expand Down
4 changes: 1 addition & 3 deletions cocos/core/components/component-event-handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

import { ccclass, type, serializable, editable, tooltip } from 'cc.decorator';
import { Node } from '../scene-graph';
import type { Node } from '../scene-graph';
import { legacyCC } from '../global-exports';

/**
Expand Down Expand Up @@ -191,5 +191,3 @@ export class EventHandler {
}
}
}

legacyCC.Component.EventHandler = EventHandler;
3 changes: 3 additions & 0 deletions cocos/core/components/component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { Node } from '../scene-graph';
import { legacyCC } from '../global-exports';
import { errorID, warnID, assertID } from '../platform/debug';
import { CompPrefabInfo } from '../utils/prefab/prefab-info';
import { EventHandler } from "./component-event-handler";

const idGenerator = new IDGenerator('Comp');
const IsOnLoadCalled = CCObject.Flags.IsOnLoadCalled;
Expand All @@ -61,6 +62,8 @@ const NullNode = null as unknown as Node;
*/
@ccclass('cc.Component')
class Component extends CCObject {
public static EventHandler = EventHandler;

get name () {
if (this._name) {
return this._name;
Expand Down
Loading

0 comments on commit 8b0fb7d

Please sign in to comment.