CocosPlugin/esengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增Sprite用于控制纹理

Browse Source
This commit is contained in:
yhh
2020-06-19 18:16:42 +08:00
parent 981e149ca5
commit d22c5775c2
18 changed files with 348 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/bin/framework.d.ts vendored
View File

@@ -146,6 +146,7 @@ declare abstract class Component {
readonly transform: Transform;
enabled: boolean;
setEnabled(isEnabled: boolean): this;
readonly stage: egret.Stage;
initialize(): void;
onAddedToEntity(): void;
onRemovedFromEntity(): void;
@@ -185,6 +186,7 @@ declare class Entity {
enabled: boolean;
setEnabled(isEnabled: boolean): this;
tag: number;
readonly stage: egret.Stage;
constructor(name: string);
updateOrder: number;
setUpdateOrder(updateOrder: number): this;
@@ -334,17 +336,17 @@ declare class Camera extends Component {
setZoom(zoom: number): this;
setPosition(position: Vector2): this;
forceMatrixUpdate(): void;
updateMatrixes(): void;
protected updateMatrixes(): void;
screenToWorldPoint(screenPosition: Vector2): Vector2;
worldToScreenPoint(worldPosition: Vector2): Vector2;
onEntityTransformChanged(comp: ComponentTransform): void;
destory(): void;
}
declare class CameraInset {
left: any;
right: any;
top: any;
bottom: any;
left: number;
right: number;
top: number;
bottom: number;
}
declare class FollowCamera extends Component {
camera: Camera;
@@ -400,26 +402,30 @@ declare abstract class RenderableComponent extends Component implements IRendera
readonly bounds: Rectangle;
protected getWidth(): number;
protected getHeight(): number;
protected getBounds(): Rectangle;
protected onBecameVisible(): void;
protected onBecameInvisible(): void;
abstract render(camera: Camera): any;
isVisibleFromCamera(camera: Camera): boolean;
onEntityTransformChanged(comp: ComponentTransform): void;
}
declare enum SpriteEffects {
none = 0,
flipHorizontally = 1,
flipVertically = 2
declare class Sprite {
texture2D: egret.Texture;
readonly sourceRect: Rectangle;
readonly center: Vector2;
origin: Vector2;
readonly uvs: Rectangle;
constructor(texture: egret.Texture, sourceRect?: Rectangle, origin?: Vector2);
}
declare class SpriteRenderer extends RenderableComponent {
private _sprite;
private _origin;
protected getBounds(): Rectangle;
sprite: egret.DisplayObject;
setSprite(sprite: egret.DisplayObject): SpriteRenderer;
private _bitmap;
readonly bounds: Rectangle;
sprite: Sprite;
setSprite(sprite: Sprite): SpriteRenderer;
origin: Vector2;
setOrigin(origin: Vector2): this;
isVisibleFromCamera(camera: Camera): boolean;
render(camera: Camera): void;
}
interface ITriggerListener {
@@ -677,6 +683,7 @@ declare class Rectangle {
intersects(value: Rectangle): boolean;
contains(value: Vector2): boolean;
containsRect(value: Rectangle): boolean;
getHalfSize(): Vector2;
static fromMinMax(minX: number, minY: number, maxX: number, maxY: number): Rectangle;
getClosestPointOnRectangleBorderToPoint(point: Point): {
res: Vector2;

144
source/bin/framework.js
View File

@@ -771,6 +771,15 @@ var Component = (function () {
}
return this;
};
Object.defineProperty(Component.prototype, "stage", {
get: function () {
if (!this.entity)
return null;
return this.entity.stage;
},
enumerable: true,
configurable: true
});
Component.prototype.initialize = function () {
};
Component.prototype.onAddedToEntity = function () {
@@ -952,6 +961,15 @@ var Entity = (function () {
enumerable: true,
configurable: true
});
Object.defineProperty(Entity.prototype, "stage", {
get: function () {
if (!this.scene)
return null;
return this.scene.stage;
},
enumerable: true,
configurable: true
});
Object.defineProperty(Entity.prototype, "updateOrder", {
get: function () {
return this._updateOrder;
@@ -1217,9 +1235,9 @@ var ComponentTransform;
var Transform = (function () {
function Transform(entity) {
this._localRotation = 0;
this._worldTransform = new Matrix2D();
this._worldToLocalTransform = new Matrix2D();
this._worldInverseTransform = new Matrix2D();
this._worldTransform = Matrix2D.identity;
this._worldToLocalTransform = Matrix2D.identity;
this._worldInverseTransform = Matrix2D.identity;
this._rotation = 0;
this.entity = entity;
this._scale = this._localScale = Vector2.one;
@@ -1317,12 +1335,15 @@ var Transform = (function () {
Object.defineProperty(Transform.prototype, "position", {
get: function () {
this.updateTransform();
if (!this.parent) {
this._position = this._localPosition;
}
else {
this.parent.updateTransform();
this._position = Vector2Ext.transformR(this._localPosition, this.parent._worldTransform);
if (this._positionDirty) {
if (!this.parent) {
this._position = this._localPosition;
}
else {
this.parent.updateTransform();
this._position = Vector2Ext.transformR(this._localPosition, this.parent._worldTransform);
}
this._positionDirty = false;
}
return this._position;
},
@@ -1441,6 +1462,7 @@ var Transform = (function () {
else {
this.localPosition = position;
}
this._positionDirty = false;
return this;
};
Transform.prototype.setDirty = function (dirtyFlagType) {
@@ -1530,9 +1552,9 @@ var Camera = (function (_super) {
if (this._areMatrixesDirty)
this.updateMatrixes();
if (this._areBoundsDirty) {
var stage = this.entity.scene.stage;
var topLeft = this.screenToWorldPoint(new Vector2(this._inset.left, this._inset.top));
var bottomRight = this.screenToWorldPoint(new Vector2(stage.stageWidth - this._inset.right, stage.stageHeight - this._inset.bottom));
var stage = this.stage;
var topLeft = this.screenToWorldPoint(new Vector2(stage.x + this._inset.left, stage.y + this._inset.top));
var bottomRight = this.screenToWorldPoint(new Vector2(stage.x + stage.stageWidth - this._inset.right, stage.y + stage.stageHeight - this._inset.bottom));
if (this.entity.transform.rotation != 0) {
var topRight = this.screenToWorldPoint(new Vector2(stage.stageWidth - this._inset.right, this._inset.top));
var bottomLeft = this.screenToWorldPoint(new Vector2(this._inset.left, stage.stageHeight - this._inset.bottom));
@@ -1706,6 +1728,10 @@ var Camera = (function (_super) {
}(Component));
var CameraInset = (function () {
function CameraInset() {
this.left = 0;
this.right = 0;
this.top = 0;
this.bottom = 0;
}
return CameraInset;
}());
@@ -1903,7 +1929,11 @@ var RenderableComponent = (function (_super) {
});
Object.defineProperty(RenderableComponent.prototype, "bounds", {
get: function () {
return this.getBounds();
if (this._areBoundsDirty) {
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, new Vector2(0, 0), this.entity.transform.scale, this.entity.transform.rotation, this.width, this.height);
this._areBoundsDirty = false;
}
return this._bounds;
},
enumerable: true,
configurable: true
@@ -1914,43 +1944,53 @@ var RenderableComponent = (function (_super) {
RenderableComponent.prototype.getHeight = function () {
return this.bounds.height;
};
RenderableComponent.prototype.getBounds = function () {
if (this._areBoundsDirty) {
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, new Vector2(0, 0), this.entity.transform.scale, this.entity.transform.rotation, this.width, this.height);
this._areBoundsDirty = false;
}
return this._bounds;
};
RenderableComponent.prototype.onBecameVisible = function () { };
RenderableComponent.prototype.onBecameInvisible = function () { };
RenderableComponent.prototype.isVisibleFromCamera = function (camera) {
return true;
this.isVisible = camera.bounds.intersects(this.bounds);
return this.isVisible;
};
RenderableComponent.prototype.onEntityTransformChanged = function (comp) {
this._areBoundsDirty = true;
};
return RenderableComponent;
}(Component));
var SpriteEffects;
(function (SpriteEffects) {
SpriteEffects[SpriteEffects["none"] = 0] = "none";
SpriteEffects[SpriteEffects["flipHorizontally"] = 1] = "flipHorizontally";
SpriteEffects[SpriteEffects["flipVertically"] = 2] = "flipVertically";
})(SpriteEffects || (SpriteEffects = {}));
var Sprite = (function () {
function Sprite(texture, sourceRect, origin) {
if (sourceRect === void 0) { sourceRect = new Rectangle(texture.textureWidth, texture.textureHeight); }
if (origin === void 0) { origin = sourceRect.getHalfSize(); }
this.uvs = new Rectangle();
this.texture2D = texture;
this.sourceRect = sourceRect;
this.center = new Vector2(sourceRect.width * 0.5, sourceRect.height * 0.5);
this.origin = origin;
var inverseTexW = 1 / texture.textureWidth;
var inverseTexH = 1 / texture.textureHeight;
this.uvs.x = sourceRect.x * inverseTexW;
this.uvs.y = sourceRect.y * inverseTexH;
this.uvs.width = sourceRect.width * inverseTexW;
this.uvs.height = sourceRect.height * inverseTexH;
}
return Sprite;
}());
var SpriteRenderer = (function (_super) {
__extends(SpriteRenderer, _super);
function SpriteRenderer() {
return _super !== null && _super.apply(this, arguments) || this;
}
SpriteRenderer.prototype.getBounds = function () {
if (this._areBoundsDirty) {
if (this._sprite) {
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, this._origin, this.entity.transform.scale, this.entity.transform.rotation, this._sprite.width, this._sprite.height);
this._areBoundsDirty = false;
Object.defineProperty(SpriteRenderer.prototype, "bounds", {
get: function () {
if (this._areBoundsDirty) {
if (this._sprite) {
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, this._origin, this.entity.transform.scale, this.entity.transform.rotation, this._sprite.texture2D.textureWidth, this._sprite.texture2D.textureHeight);
this._areBoundsDirty = false;
}
}
return this.bounds;
}
};
return this._bounds;
},
enumerable: true,
configurable: true
});
Object.defineProperty(SpriteRenderer.prototype, "sprite", {
get: function () {
return this._sprite;
@@ -1964,7 +2004,9 @@ var SpriteRenderer = (function (_super) {
SpriteRenderer.prototype.setSprite = function (sprite) {
this._sprite = sprite;
if (this._sprite)
this._origin = new Vector2(this._sprite.anchorOffsetX, this._sprite.anchorOffsetY);
this._origin = sprite.origin;
this._bitmap = new egret.Bitmap(sprite.texture2D);
this.stage.addChild(this._bitmap);
return this;
};
Object.defineProperty(SpriteRenderer.prototype, "origin", {
@@ -1984,16 +2026,21 @@ var SpriteRenderer = (function (_super) {
}
return this;
};
SpriteRenderer.prototype.isVisibleFromCamera = function (camera) {
this.isVisible = new Rectangle(0, 0, this.stage.stageWidth, this.stage.stageHeight).intersects(this.bounds);
this._bitmap.visible = this.isVisible;
return this.isVisible;
};
SpriteRenderer.prototype.render = function (camera) {
if (!this.sprite)
return;
this.sprite.x = this.entity.transform.position.x - camera.transform.position.x;
this.sprite.y = this.entity.transform.position.y - camera.transform.position.y;
this.sprite.rotation = this.entity.transform.rotation;
this.sprite.anchorOffsetX = this._origin.x;
this.sprite.anchorOffsetY = this._origin.y;
this.sprite.scaleX = this.entity.transform.scale.x;
this.sprite.scaleY = this.entity.transform.scale.y;
this._bitmap.x = this.entity.transform.position.x - camera.transform.position.x + camera.origin.x;
this._bitmap.y = this.entity.transform.position.y - camera.transform.position.y + camera.origin.y;
this._bitmap.rotation = this.entity.transform.rotation;
this._bitmap.anchorOffsetX = this._origin.x;
this._bitmap.anchorOffsetY = this._origin.y;
this._bitmap.scaleX = this.entity.transform.scale.x;
this._bitmap.scaleY = this.entity.transform.scale.y;
};
return SpriteRenderer;
}(RenderableComponent));
@@ -3162,6 +3209,9 @@ var Rectangle = (function () {
(this.y <= value.y)) &&
(value.y < (this.y + this.height)));
};
Rectangle.prototype.getHalfSize = function () {
return new Vector2(this.width * 0.5, this.height * 0.5);
};
Rectangle.fromMinMax = function (minX, minY, maxX, maxY) {
return new Rectangle(minX, minY, maxX - minX, maxY - minY);
};
@@ -3230,10 +3280,10 @@ var Rectangle = (function () {
var topRight = new Vector2(worldPosX + width, worldPosY);
var bottomLeft = new Vector2(worldPosX, worldPosY + height);
var bottomRight = new Vector2(worldPosX + width, worldPosY + height);
topLeft = Vector2.transform(topLeft, this._transformMat);
topRight = Vector2.transform(topRight, this._transformMat);
bottomLeft = Vector2.transform(bottomLeft, this._transformMat);
bottomRight = Vector2.transform(bottomRight, this._transformMat);
topLeft = Vector2Ext.transformR(topLeft, this._transformMat);
topRight = Vector2Ext.transformR(topRight, this._transformMat);
bottomLeft = Vector2Ext.transformR(bottomLeft, this._transformMat);
bottomRight = Vector2Ext.transformR(bottomRight, this._transformMat);
var minX = Math.min(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
var maxX = Math.max(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
var minY = Math.min(topLeft.y, bottomRight.y, topRight.y, bottomLeft.y);

2
source/bin/framework.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
source/src/ECS/Component.ts
View File

@@ -29,6 +29,13 @@ abstract class Component {
return this;
}
public get stage(){
if (!this.entity)
return null;
return this.entity.stage;
}
public initialize(){
}

16
source/src/ECS/Components/Camera.ts
View File

@@ -19,9 +19,9 @@ class Camera extends Component {
this.updateMatrixes();
if (this._areBoundsDirty){
let stage = this.entity.scene.stage;
let topLeft = this.screenToWorldPoint(new Vector2(this._inset.left, this._inset.top));
let bottomRight = this.screenToWorldPoint(new Vector2(stage.stageWidth - this._inset.right, stage.stageHeight - this._inset.bottom));
let stage = this.stage;
let topLeft = this.screenToWorldPoint(new Vector2(stage.x + this._inset.left, stage.y + this._inset.top));
let bottomRight = this.screenToWorldPoint(new Vector2(stage.x + stage.stageWidth - this._inset.right, stage.y + stage.stageHeight - this._inset.bottom));
if (this.entity.transform.rotation != 0){
let topRight = this.screenToWorldPoint(new Vector2(stage.stageWidth - this._inset.right, this._inset.top));
@@ -163,7 +163,7 @@ class Camera extends Component {
this._areMatrixesDirty = true;
}
public updateMatrixes(){
protected updateMatrixes(){
if (!this._areMatrixesDirty)
return;
@@ -208,8 +208,8 @@ class Camera extends Component {
}
class CameraInset {
public left;
public right;
public top;
public bottom;
public left = 0;
public right = 0;
public top = 0;
public bottom = 0;
}

24
source/src/ECS/Components/RenderableComponent.ts
View File

@@ -29,7 +29,13 @@ abstract class RenderableComponent extends Component implements IRenderable {
}
public get bounds(): Rectangle{
return this.getBounds();
if (this._areBoundsDirty){
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, new Vector2(0, 0),
this.entity.transform.scale, this.entity.transform.rotation, this.width, this.height);
this._areBoundsDirty = false;
}
return this._bounds;
}
protected getWidth(){
@@ -40,16 +46,6 @@ abstract class RenderableComponent extends Component implements IRenderable {
return this.bounds.height;
}
protected getBounds(){
if (this._areBoundsDirty){
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, new Vector2(0, 0),
this.entity.transform.scale, this.entity.transform.rotation, this.width, this.height);
this._areBoundsDirty = false;
}
return this._bounds;
}
protected onBecameVisible(){}
protected onBecameInvisible(){}
@@ -57,10 +53,8 @@ abstract class RenderableComponent extends Component implements IRenderable {
public abstract render(camera: Camera);
public isVisibleFromCamera(camera: Camera): boolean{
// this.isVisible = camera.bounds.intersects(this.bounds);
// return this.isVisible;
return true;
this.isVisible = camera.bounds.intersects(this.bounds);
return this.isVisible;
}
public onEntityTransformChanged(comp: ComponentTransform){

24
source/src/ECS/Components/Sprite.ts Normal file
View File

@@ -0,0 +1,24 @@
class Sprite {
public texture2D: egret.Texture;
public readonly sourceRect: Rectangle;
public readonly center: Vector2;
public origin: Vector2;
public readonly uvs: Rectangle = new Rectangle();
constructor(texture: egret.Texture,
sourceRect: Rectangle = new Rectangle(texture.textureWidth, texture.textureHeight),
origin: Vector2 = sourceRect.getHalfSize()){
this.texture2D = texture;
this.sourceRect = sourceRect;
this.center = new Vector2(sourceRect.width * 0.5, sourceRect.height * 0.5);
this.origin = origin;
let inverseTexW = 1 / texture.textureWidth;
let inverseTexH = 1 / texture.textureHeight
this.uvs.x = sourceRect.x * inverseTexW;
this.uvs.y = sourceRect.y * inverseTexH;
this.uvs.width = sourceRect.width * inverseTexW;
this.uvs.height = sourceRect.height * inverseTexH;
}
}

5
source/src/ECS/Components/SpriteEffects.ts
View File

@@ -1,5 +0,0 @@
enum SpriteEffects {
none = 0,
flipHorizontally = 1,
flipVertically = 2
}

44
source/src/ECS/Components/SpriteRenderer.ts
View File

@@ -1,32 +1,36 @@
class SpriteRenderer extends RenderableComponent {
private _sprite: egret.DisplayObject;
private _sprite: Sprite;
private _origin: Vector2;
private _bitmap: egret.Bitmap;
protected getBounds(){
public get bounds(){
if (this._areBoundsDirty){
if (this._sprite){
this._bounds.calculateBounds(this.entity.transform.position, this._localOffset, this._origin,
this.entity.transform.scale, this.entity.transform.rotation, this._sprite.width,
this._sprite.height);
this.entity.transform.scale, this.entity.transform.rotation, this._sprite.texture2D.textureWidth,
this._sprite.texture2D.textureHeight);
this._areBoundsDirty = false;
}
return this.bounds;
}
return this._bounds;
}
public get sprite(){
return this._sprite;
}
public set sprite(value: egret.DisplayObject){
public set sprite(value: Sprite){
this.setSprite(value);
}
public setSprite(sprite: egret.DisplayObject): SpriteRenderer{
public setSprite(sprite: Sprite): SpriteRenderer{
this._sprite = sprite;
if (this._sprite)
this._origin = new Vector2(this._sprite.anchorOffsetX, this._sprite.anchorOffsetY);
this._origin = sprite.origin;
this._bitmap = new egret.Bitmap(sprite.texture2D);
this.stage.addChild(this._bitmap);
return this;
}
@@ -45,16 +49,22 @@ class SpriteRenderer extends RenderableComponent {
return this;
}
public render(camera: Camera) {
public isVisibleFromCamera(camera: Camera): boolean{
this.isVisible = new Rectangle(0, 0, this.stage.stageWidth, this.stage.stageHeight).intersects(this.bounds);
this._bitmap.visible = this.isVisible;
return this.isVisible;
}
public render(camera: Camera){
if (!this.sprite)
return;
this.sprite.x = this.entity.transform.position.x - camera.transform.position.x;
this.sprite.y = this.entity.transform.position.y - camera.transform.position.y;
this.sprite.rotation = this.entity.transform.rotation;
this.sprite.anchorOffsetX = this._origin.x;
this.sprite.anchorOffsetY = this._origin.y;
this.sprite.scaleX = this.entity.transform.scale.x;
this.sprite.scaleY = this.entity.transform.scale.y;
this._bitmap.x = this.entity.transform.position.x - camera.transform.position.x + camera.origin.x;
this._bitmap.y = this.entity.transform.position.y - camera.transform.position.y + camera.origin.y;
this._bitmap.rotation = this.entity.transform.rotation;
this._bitmap.anchorOffsetX = this._origin.x;
this._bitmap.anchorOffsetY = this._origin.y;
this._bitmap.scaleX = this.entity.transform.scale.x;
this._bitmap.scaleY = this.entity.transform.scale.y;
}
}

7
source/src/ECS/Entity.ts
View File

@@ -128,6 +128,13 @@ class Entity {
this.setTag(value);
}
public get stage(){
if (!this.scene)
return null;
return this.scene.stage;
}
constructor(name: string){
this.name = name;
this.transform = new Transform(this);

25
source/src/ECS/Transform.ts
View File

@@ -25,9 +25,9 @@ class Transform {
private _rotationMatrix: Matrix2D;
private _scaleMatrix: Matrix2D;
private _worldTransform = new Matrix2D();
private _worldToLocalTransform = new Matrix2D();
private _worldInverseTransform = new Matrix2D();
private _worldTransform = Matrix2D.identity;
private _worldToLocalTransform = Matrix2D.identity;
private _worldInverseTransform = Matrix2D.identity;
private _rotation: number = 0;
private _position: Vector2;
@@ -130,13 +130,18 @@ class Transform {
public get position(){
this.updateTransform();
if (!this.parent){
this._position = this._localPosition;
}else{
this.parent.updateTransform();
this._position = Vector2Ext.transformR(this._localPosition, this.parent._worldTransform);
if (this._positionDirty){
if (!this.parent){
this._position = this._localPosition;
}else{
this.parent.updateTransform();
this._position = Vector2Ext.transformR(this._localPosition, this.parent._worldTransform);
}
this._positionDirty = false;
}
return this._position;
}
@@ -255,6 +260,8 @@ class Transform {
this.localPosition = position;
}
this._positionDirty = false;
return this;
}
@@ -303,13 +310,11 @@ class Transform {
this._localRotationDirty = false;
}
if (this._localScaleDirty){
this._scaleMatrix = Matrix2D.createScale(this._localScale.x, this._localScale.y);
this._localScaleDirty = false;
}
this._localTransform = Matrix2D.multiply(this._scaleMatrix, this._rotationMatrix);
this._localTransform = Matrix2D.multiply(this._localTransform, this._translationMatrix);

12
source/src/Math/Rectangle.ts
View File

@@ -71,6 +71,10 @@ class Rectangle {
(value.y < (this.y + this.height)));
}
public getHalfSize(){
return new Vector2(this.width * 0.5, this.height * 0.5);
}
public static fromMinMax(minX: number, minY: number, maxX: number, maxY: number) {
return new Rectangle(minX, minY, maxX - minX, maxY - minY);
}
@@ -144,10 +148,10 @@ class Rectangle {
let bottomLeft = new Vector2(worldPosX, worldPosY + height);
let bottomRight = new Vector2(worldPosX + width, worldPosY + height);
topLeft = Vector2.transform(topLeft, this._transformMat);
topRight = Vector2.transform(topRight, this._transformMat);
bottomLeft = Vector2.transform(bottomLeft, this._transformMat);
bottomRight = Vector2.transform(bottomRight, this._transformMat);
topLeft = Vector2Ext.transformR(topLeft, this._transformMat);
topRight = Vector2Ext.transformR(topRight, this._transformMat);
bottomLeft = Vector2Ext.transformR(bottomLeft, this._transformMat);
bottomRight = Vector2Ext.transformR(bottomRight, this._transformMat);
let minX = Math.min(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);
let maxX = Math.max(topLeft.x, bottomRight.x, topRight.x, bottomLeft.x);