Skip to content

Changing view.x / view.y positions viewport correctly #6

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

Open
joaBaur wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Changing view.x / view.y positions viewport correctly #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cfe6fe
Setting view.x / view.y now positions viewport correctly
joaBaur Jun 30, 2014
4d46be4
Fix for exception thrown by RemoveChild() when _iAssignedPartition is…
joaBaur Jul 2, 2014
252bdfa
Revert "Fix for exception thrown by RemoveChild() when _iAssignedPart…
joaBaur Jul 2, 2014
1e10ddf
Fix for "_iAssignedPartition ist NULL"-exception on removeChild()
joaBaur Jul 2, 2014
594ee00
Revert "Fix for "_iAssignedPartition ist NULL"-exception on removeChi…
joaBaur Jul 2, 2014
837b22d
Fix for bitmapData.setPixels()
joaBaur Jul 29, 2014
04dd168
Fix for CylinderPrefab topClosed and bottomClosed
joaBaur Jul 30, 2014
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
6 changes: 4 additions & 2 deletions src/away/containers/View.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ module away.containers
if (this._pRenderer.x == value)
return;

this._pRenderer.x == value;
this._pRenderer.x = value;
this._pRenderer._pStageGL.x = value;
this._htmlElement.style.left = value + "px";
}

Expand All @@ -398,7 +399,8 @@ module away.containers
if (this._pRenderer.y == value)
return;

this._pRenderer.y == value;
this._pRenderer.y = value;
this._pRenderer._pStageGL.y = value;
this._htmlElement.style.top = value + "px";
}

Expand Down
17 changes: 9 additions & 8 deletions src/away/core/base/BitmapData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,15 @@ module away.base
if (this._imageData) {
inputByteArray.position = 0;
var i:number /*uint*/, j:number /*uint*/, index:number /*uint*/;
for (i = 0; i < rect.width; ++i) {
for (j = 0; j < rect.height; ++j) {
index = (i + rect.x + (j + rect.y)*this._imageCanvas.width)*4;

this._imageData.data[index + 0] = inputByteArray.readUnsignedInt();
this._imageData.data[index + 1] = inputByteArray.readUnsignedInt();
this._imageData.data[index + 2] = inputByteArray.readUnsignedInt();
this._imageData.data[index + 3] = inputByteArray.readUnsignedInt();
for (i = rect.height-1; i >= 0; --i) { // height counter has to be in the outer loop, reversed y orientation
for (j = 0; j < rect.width; ++j) {
index = (j + rect.x + (i + rect.y)*this._imageCanvas.width)*4;

var argb = away.utils.ColorUtils.float32ColorToARGB(inputByteArray.readUnsignedInt()); // readUnsignedInt returns a 32 bit color value
this._imageData.data[index + 0] = argb[3]; // B
this._imageData.data[index + 1] = argb[2]; // G
this._imageData.data[index + 2] = argb[1]; // R
this._imageData.data[index + 3] = argb[0]; // A
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/away/prefabs/PrimitiveCylinderPrefab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ module away.prefabs

if (i > 0) {
// add triangle
indices[fidx++] = nextVertexIndex;
indices[fidx++] = nextVertexIndex + 3;
indices[fidx++] = nextVertexIndex + 1;
indices[fidx++] = nextVertexIndex + 2;

Expand Down Expand Up @@ -394,9 +394,9 @@ module away.prefabs

if (i > 0) {
// add triangle
indices[fidx++] = nextVertexIndex;
indices[fidx++] = nextVertexIndex + 2;
indices[fidx++] = nextVertexIndex + 1;
indices[fidx++] = nextVertexIndex + 3;

nextVertexIndex += 2;
}
Expand Down