Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4b19b78

Browse files
committed
fix canvas draw point error
1 parent7eb4663 commit4b19b78

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

‎cocos2d/core/CCDrawingPrimitivesCanvas.js‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
5656
if(!size){
5757
size=1;
5858
}
59-
varlocScaleX=cc.view.getScaleX(),locScaleY=cc.view.getScaleY();
60-
varnewPoint=cc.p(point.x*locScaleX,point.y*locScaleY);
6159
varctx=this._renderContext.getContext();
6260
ctx.beginPath();
63-
ctx.arc(newPoint.x,-newPoint.y,size*locScaleX,0,Math.PI*2,false);
61+
ctx.arc(point.x,-point.y,size,0,Math.PI*2,false);
6462
ctx.closePath();
6563
ctx.fill();
6664
},
@@ -79,11 +77,11 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
7977
if(!size){
8078
size=1;
8179
}
82-
varlocContext=this._renderContext.getContext(),locScaleX=cc.view.getScaleX(),locScaleY=cc.view.getScaleY();
80+
varlocContext=this._renderContext.getContext();
8381

8482
locContext.beginPath();
8583
for(vari=0,len=points.length;i<len;i++)
86-
locContext.arc(points[i].x*locScaleX,-points[i].y*locScaleY,size*locScaleX,0,Math.PI*2,false);
84+
locContext.arc(points[i].x,-points[i].y,size,0,Math.PI*2,false);
8785
locContext.closePath();
8886
locContext.fill();
8987
},
@@ -95,7 +93,7 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
9593
*@param {cc.Point} destination
9694
*/
9795
drawLine:function(origin,destination){
98-
varlocContext=this._renderContext.getContext(),locScaleX=cc.view.getScaleX(),locScaleY=cc.view.getScaleY();
96+
varlocContext=this._renderContext.getContext();
9997
locContext.beginPath();
10098
locContext.moveTo(origin.x,-origin.y);
10199
locContext.lineTo(destination.x,-destination.y);
@@ -151,7 +149,6 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
151149
thrownewError("Polygon's point must greater than 2");
152150

153151
varfirstPoint=vertices[0],locContext=this._renderContext.getContext();
154-
varlocScaleX=cc.view.getScaleX(),locScaleY=cc.view.getScaleY();
155152
locContext.beginPath();
156153
locContext.moveTo(firstPoint.x,-firstPoint.y);
157154
for(vari=1,len=vertices.length;i<len;i++)
@@ -189,7 +186,6 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
189186
drawCircle:function(center,radius,angle,segments,drawLineToCenter){
190187
drawLineToCenter=drawLineToCenter||false;
191188
varlocContext=this._renderContext.getContext();
192-
varlocScaleX=cc.view.getScaleX(),locScaleY=cc.view.getScaleY();
193189
locContext.beginPath();
194190
varendAngle=angle-Math.PI*2;
195191
locContext.arc(0|(center.x),0|-(center.y),radius,-angle,-endAngle,false);
@@ -379,7 +375,6 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
379375
drawColorBall:function(ctx,radius,color){
380376
varwrapper=ctx||this._renderContext;
381377
varcontext=wrapper.getContext();
382-
radius*=cc.view.getScaleX();
383378
varcolorStr="rgba("+(0|color.r)+","+(0|color.g)+","+(0|color.b);
384379
varsubRadius=radius/10;
385380

@@ -432,6 +427,6 @@ cc.DrawingPrimitiveCanvas = cc.Class.extend(/** @lends cc.DrawingPrimitiveCanvas
432427
*@param {Number} width
433428
*/
434429
setLineWidth:function(width){
435-
this._renderContext.getContext().lineWidth=width*cc.view.getScaleX();
430+
this._renderContext.getContext().lineWidth=width;
436431
}
437432
});

‎extensions/spine/CCSkeletonCanvasRenderCmd.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,12 @@ proto.rendering = function (wrapper, scaleX, scaleY) {
8787
}
8888

8989
// Bone origins.
90-
// FIXME: point position wrong, might due to scale
91-
drawingUtil.setPointSize(4);
90+
varpointSize=4;
9291
drawingUtil.setDrawColor(0,0,255,255);// Root bone is blue.
9392

9493
for(i=0,n=locSkeleton.bones.length;i<n;i++){
9594
bone=locSkeleton.bones[i];
96-
drawingUtil.drawPoint({x:bone.worldX,y:bone.worldY});
95+
drawingUtil.drawPoint({x:bone.worldX,y:bone.worldY},pointSize);
9796
if(i===0)
9897
drawingUtil.setDrawColor(0,255,0,255);
9998
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp