Skip to content

Commit

Permalink
fixed pixi texture bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@akdcl
akdcl committed Mar 14, 2017
1 parent 4147782 commit 5f5d95e
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 49 deletions.
8 changes: 4 additions & 4 deletions DragonBones/build/dragonBones.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3276,10 +3276,10 @@ var dragonBones;
this._rawBones.length = 0;
if (ObjectDataParser.AABB in rawData) {
var rawAABB = rawData[ObjectDataParser.AABB];
armature.aabb.x = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.X, 0);
armature.aabb.y = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.Y, 0);
armature.aabb.width = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.WIDTH, 0);
armature.aabb.height = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.HEIGHT, 0);
armature.aabb.x = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.X, 0.0);
armature.aabb.y = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.Y, 0.0);
armature.aabb.width = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.WIDTH, 0.0);
armature.aabb.height = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.HEIGHT, 0.0);
}
if (ObjectDataParser.BONE in rawData) {
var rawBones = rawData[ObjectDataParser.BONE];
Expand Down
8 changes: 4 additions & 4 deletions DragonBones/src/dragonBones/parser/ObjectDataParser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ namespace dragonBones {

if (ObjectDataParser.AABB in rawData) {
const rawAABB = rawData[ObjectDataParser.AABB];
armature.aabb.x = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.X, 0);
armature.aabb.y = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.Y, 0);
armature.aabb.width = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.WIDTH, 0);
armature.aabb.height = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.HEIGHT, 0);
armature.aabb.x = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.X, 0.0);
armature.aabb.y = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.Y, 0.0);
armature.aabb.width = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.WIDTH, 0.0);
armature.aabb.height = ObjectDataParser._getNumber(rawAABB, ObjectDataParser.HEIGHT, 0.0);
}

if (ObjectDataParser.BONE in rawData) {
Expand Down
4 changes: 0 additions & 4 deletions Egret/build/dragonBonesEgret.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@ declare namespace dragonBones {
class EgretArmatureDisplay extends egret.DisplayObjectContainer implements IArmatureDisplay, IEventDispatcher {
private _disposeProxy;
private _debugDrawer;
/**
* @private
*/
constructor();
/**
* @private
*/
Expand Down
6 changes: 5 additions & 1 deletion Egret/build/dragonBonesEgret.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ var dragonBones;
var EgretArmatureDisplay = (function (_super) {
__extends(EgretArmatureDisplay, _super);
/**
* @internal
* @private
*/
function EgretArmatureDisplay() {
Expand Down Expand Up @@ -765,6 +766,7 @@ var dragonBones;
normalDisplay.$setAnchorOffsetX(this._pivotX);
normalDisplay.$setAnchorOffsetY(this._pivotY);
}
this._updateVisible();
return;
}
}
Expand All @@ -773,12 +775,14 @@ var dragonBones;
meshDisplay.$setBitmapData(null);
meshDisplay.x = 0.0;
meshDisplay.y = 0.0;
meshDisplay.visible = false;
}
else {
var normalDisplay = this._renderDisplay;
normalDisplay.$setBitmapData(null);
normalDisplay.x = 0.0;
normalDisplay.y = 0.0;
normalDisplay.visible = false;
}
};
/**
Expand Down Expand Up @@ -890,7 +894,7 @@ var dragonBones;
EgretFactory._clockHandler = function (time) {
time *= 0.001;
var passedTime = time - EgretFactory._clock.time;
EgretFactory._clock.advanceTime(0.01);
EgretFactory._clock.advanceTime(passedTime);
EgretFactory._clock.time = time;
return false;
};
Expand Down
4 changes: 2 additions & 2 deletions Egret/build/dragonBonesEgret.min.js
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Egret/src/dragonBones/egret/EgretSlot.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,24 +241,23 @@ namespace dragonBones {
}

this._updateVisible();

return;
}
}

if (isMeshDisplay) {
const meshDisplay = this._renderDisplay as egret.Mesh;
meshDisplay.visible = false;
meshDisplay.$setBitmapData(null);
meshDisplay.x = 0.0;
meshDisplay.y = 0.0;
meshDisplay.visible = false;
}
else {
const normalDisplay = this._renderDisplay as egret.Bitmap;
normalDisplay.visible = false;
normalDisplay.$setBitmapData(null);
normalDisplay.x = 0.0;
normalDisplay.y = 0.0;
normalDisplay.visible = false;
}
}
/**
Expand Down
8 changes: 4 additions & 4 deletions Pixi/Demos/js/HelloDragonBones.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ var demosPixi;
}
HelloDragonBones.prototype._onStart = function () {
PIXI.loader
.add("dragonBonesData", "./resource/assets/Ubbie/Ubbie.json")
.add("textureDataA", "./resource/assets/Ubbie/texture.json")
.add("textureA", "./resource/assets/Ubbie/texture.png");
.add("dragonBonesData", "./resource/assets/DragonBoy/DragonBoy.json")
.add("textureDataA", "./resource/assets/DragonBoy/DragonBoy_texture_1.json")
.add("textureA", "./resource/assets/DragonBoy/DragonBoy_texture_1.png");
PIXI.loader.once("complete", this._loadComplateHandler, this);
PIXI.loader.load();
};
HelloDragonBones.prototype._loadComplateHandler = function (loader, resources) {
dragonBones.PixiFactory.factory.parseDragonBonesData(resources["dragonBonesData"].data);
dragonBones.PixiFactory.factory.parseTextureAtlasData(resources["textureDataA"].data, resources["textureA"].texture);
var armatureDisplay = dragonBones.PixiFactory.factory.buildArmatureDisplay("ubbie");
var armatureDisplay = dragonBones.PixiFactory.factory.buildArmatureDisplay("DragonBoy");
armatureDisplay.animation.play("walk");
this._stage.addChild(armatureDisplay);
armatureDisplay.x = this._renderer.width * 0.5;
Expand Down
30 changes: 20 additions & 10 deletions Pixi/build/dragonBonesPixi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ var dragonBones;
var normalDisplay = this._renderDisplay;
normalDisplay.texture = currentTextureData.texture;
}
this._updateVisible();
return;
}
}
Expand All @@ -432,12 +433,14 @@ var dragonBones;
meshDisplay.texture = null;
meshDisplay.x = 0.0;
meshDisplay.y = 0.0;
meshDisplay.visible = false;
}
else {
var normalDisplay = this._renderDisplay;
normalDisplay.texture = null;
normalDisplay.x = 0.0;
normalDisplay.y = 0.0;
normalDisplay.visible = false;
}
};
/**
Expand Down Expand Up @@ -591,33 +594,40 @@ var dragonBones;
* @private
*/
PixiFactory.prototype._generateSlot = function (dataPackage, skinSlotData, armature) {
var slotData = skinSlotData.slot;
var slot = dragonBones.BaseObject.borrowObject(dragonBones.PixiSlot);
slot._init(skinSlotData, new PIXI.Sprite(), new PIXI.mesh.Mesh(null, null, null, null, PIXI.mesh.Mesh.DRAW_MODES.TRIANGLES));
var displayList = [];
slot._init(skinSlotData, new PIXI.Sprite(), new PIXI.mesh.Mesh(null, null, null, null, PIXI.mesh.Mesh.DRAW_MODES.TRIANGLES));
for (var i = 0, l = skinSlotData.displays.length; i < l; ++i) {
var displayData = skinSlotData.displays[i];
switch (displayData.type) {
case 0 /* Image */:
if (!displayData.texture || dataPackage.textureAtlasName) {
displayData.texture = this._getTextureData(dataPackage.textureAtlasName || dataPackage.dataName, displayData.path);
if (!displayData.texture) {
displayData.texture = this._getTextureData(dataPackage.dataName, displayData.path);
}
displayList.push(slot.rawDisplay);
if (dataPackage.textureAtlasName) {
slot._textureDatas[i] = this._getTextureData(dataPackage.textureAtlasName, displayData.path);
}
displayList[i] = slot.rawDisplay;
break;
case 2 /* Mesh */:
if (!displayData.texture || dataPackage.textureAtlasName) {
displayData.texture = this._getTextureData(dataPackage.textureAtlasName || dataPackage.dataName, displayData.path);
if (!displayData.texture) {
displayData.texture = this._getTextureData(dataPackage.dataName, displayData.path);
}
if (dataPackage.textureAtlasName) {
slot._textureDatas[i] = this._getTextureData(dataPackage.textureAtlasName, displayData.path);
}
if (!displayData.mesh && displayData.share) {
displayData.mesh = skinSlotData.getMesh(displayData.share);
}
displayList.push(slot.meshDisplay);
displayList[i] = slot.meshDisplay;
break;
case 1 /* Armature */:
var childArmature = this.buildArmature(displayData.path, dataPackage.dataName, null, dataPackage.textureAtlasName);
if (childArmature) {
childArmature.inheritAnimation = displayData.inheritAnimation;
if (!childArmature.inheritAnimation) {
var actions = skinSlotData.slot.actions.length > 0 ? skinSlotData.slot.actions : childArmature.armatureData.actions;
var actions = slotData.actions.length > 0 ? slotData.actions : childArmature.armatureData.actions;
if (actions.length > 0) {
for (var i_2 = 0, l_2 = actions.length; i_2 < l_2; ++i_2) {
childArmature._bufferAction(actions[i_2]);
Expand All @@ -629,10 +639,10 @@ var dragonBones;
}
displayData.armature = childArmature.armatureData; //
}
displayList.push(childArmature);
displayList[i] = childArmature;
break;
default:
displayList.push(null);
displayList[i] = null;
break;
}
}
Expand Down

0 comments on commit 5f5d95e

Please sign in to comment.