mFormat;
-
- if (format != cacheFormat)
- {
- if (inUnderlineTag && !format->underline)
- {
- result += L"";
- inAlign = false;
- }
-
- if (inItalicTag && !format->italic)
- {
- result += L"";
- inItalicTag = false;
- }
-
- if (inBoldTag && !format->bold)
- {
- result += L"";
- inBoldTag = false;
- }
-
- if (inFontTag && (WString (format->font).compare (cacheFormat->font) != 0 || format->color != cacheFormat->color || format->size != cacheFormat->size))
- {
- result += L"";
- inFontTag = false;
- }
-
- if (inAlign && format->align != cacheFormat->align)
- {
- result += L"";
- inAlign = false;
- }
- }
-
- if (!inAlign && format->align != tfaLeft)
- {
- result += L"align)
- {
+ CharGroup *charGroup = mCharGroups[i];
+ TextFormat *format = charGroup->mFormat;
+
+ if (format != cacheFormat)
+ {
+ if (inUnderlineTag && !format->underline)
+ {
+ result += L"";
+ inAlign = false;
+ }
+
+ if (inItalicTag && !format->italic)
+ {
+ result += L"";
+ inItalicTag = false;
+ }
+
+ if (inBoldTag && !format->bold)
+ {
+ result += L"";
+ inBoldTag = false;
+ }
+
+ if (inFontTag && (WString (format->font).compare (cacheFormat->font) != 0 || format->color != cacheFormat->color || format->size != cacheFormat->size))
+ {
+ result += L"";
+ inFontTag = false;
+ }
+
+ if (inAlign && format->align != cacheFormat->align)
+ {
+ result += L"
";
+ inAlign = false;
+ }
+ }
+
+ if (!inAlign && format->align != tfaLeft)
+ {
+ result += L"align)
+ {
case tfaLeft: break;
case tfaCenter: result += L"center"; break;
- case tfaRight: result += L"right"; break;
- case tfaJustify: result += L"justify"; break;
- }
-
- result += L"\">";
- inAlign = true;
- }
-
- if (!inFontTag)
- {
- result += L"color);
- result += L"\" face=\"";
- result += format->font;
- result += L"\" size=\"";
- result += IntToWide(format->size);
- result += L"\">";
- inFontTag = true;
- }
-
- if (!inBoldTag && format->bold)
- {
- result += L"";
- inBoldTag = true;
- }
-
- if (!inItalicTag && format->italic)
- {
- result += L"";
- inItalicTag = true;
- }
-
- if (!inUnderlineTag && format->underline)
- {
- result += L"";
- inUnderlineTag = true;
- }
-
- result += WString(charGroup->mString.mPtr, charGroup->Chars());
- cacheFormat = format;
+ case tfaRight: result += L"right"; break;
+ case tfaJustify: result += L"justify"; break;
+ }
+
+ result += L"\">";
+ inAlign = true;
+ }
+
+ if (!inFontTag)
+ {
+ result += L"color);
+ result += L"\" face=\"";
+ result += format->font;
+ result += L"\" size=\"";
+ result += IntToWide(format->size);
+ result += L"\">";
+ inFontTag = true;
+ }
+
+ if (!inBoldTag && format->bold)
+ {
+ result += L"";
+ inBoldTag = true;
+ }
+
+ if (!inItalicTag && format->italic)
+ {
+ result += L"";
+ inItalicTag = true;
+ }
+
+ if (!inUnderlineTag && format->underline)
+ {
+ result += L"";
+ inUnderlineTag = true;
+ }
+
+ result += WString(charGroup->mString.mPtr, charGroup->Chars());
+ cacheFormat = format;
}
-
+
if (inUnderlineTag) result += L"";
if (inItalicTag) result += L"";
if (inBoldTag) result += L"";
if (inFontTag) result += L"";
if (inAlign) result += L"
";
-
+
return result;
}
@@ -1211,17 +1219,19 @@ int TextField::GroupFromChar(int inChar)
-int TextField::EndOfLineX(int inLine)
+double TextField::EndOfLineX(int inLine) const
{
- Line &line = mLines[inLine];
+ const Line &line = mLines[inLine];
+ if (line.mChars==0)
+ return GAP;
return mCharPos[ line.mChar0 ].x + line.mMetrics.width;
}
-int TextField::EndOfCharX(int inChar,int inLine)
+double TextField::EndOfCharX(int inChar,int inLine) const
{
if (inLine<0 || inLine>=mLines.size() || inChar<0 || inChar>=mCharPos.size())
return 0;
- Line &line = mLines[inLine];
+ const Line &line = mLines[inLine];
// Not last character on line?
if (inChar < line.mChar0 + line.mChars -1 )
return mCharPos[inChar+1].x;
@@ -1249,6 +1259,9 @@ WString TextField::getLineText(int inLine)
return L"";
Line &line = mLines[inLine];
+ if (line.mChars==0)
+ return L"";
+
int g0 = GroupFromChar(line.mChar0);
int g1 = GroupFromChar(line.mChar0 + line.mChars-1);
@@ -1283,14 +1296,14 @@ TextLineMetrics *TextField::getLineMetrics(int inLine)
return &line.mMetrics;
}
-ImagePoint TextField::GetScrollPos()
+UserPoint TextField::GetScrollPos() const
{
- return ImagePoint(scrollH,mLines[std::max(0,scrollV-1)].mY0-2);
+ return UserPoint(scrollH,mLines[std::max(0,scrollV-1)].mY0-GAP);
}
-ImagePoint TextField::GetCursorPos()
+UserPoint TextField::GetCursorPos() const
{
- ImagePoint pos(0,0);
+ UserPoint pos(0,0);
if (caretIndex < mCharPos.size())
pos = mCharPos[caretIndex];
else if (mLines.size())
@@ -1301,6 +1314,15 @@ ImagePoint TextField::GetCursorPos()
return pos;
}
+bool TextField::isLineVisible(int inLine) const
+{
+ if (inLinelineStyle(-1);
mHighlightGfx->beginFill( 0x101060, 1);
// Special case of begin/end on same line ...
if (l0==l1)
{
- //printf("HI %dx%d sv=%d (%d,%d) %d\n", pos.x,pos.y, scrollV, scroll.x, scroll.y, mSelectMin);
- mHighlightGfx->drawRect(pos.x,pos.y,x1-pos.x,height);
+ if (isLineVisible(l0))
+ highlightRect(pos.x,pos.y,x1-pos.x,height);
}
else
{
- mHighlightGfx->drawRect(pos.x,pos.y,EndOfLineX(l0)- scroll.x-pos.x,height);
+ if (isLineVisible(l0))
+ highlightRect(pos.x,pos.y,EndOfLineX(l0)- scroll.x-pos.x,height);
+
for(int y=l0+1;ydrawRect(pos.x,pos.y,EndOfLineX(y)-scroll.x-pos.x,line.mMetrics.height);
+ if (isLineVisible(y))
+ {
+ Line &line = mLines[y];
+ pos = mCharPos[line.mChar0]-scroll;
+ highlightRect(pos.x,pos.y,EndOfLineX(y)-scroll.x-pos.x,line.mMetrics.height);
+ }
+ }
+ if (isLineVisible(l1))
+ {
+ Line &line = mLines[l1];
+ pos = mCharPos[line.mChar0]-scroll;
+ highlightRect(pos.x,pos.y,x1-pos.x,line.mMetrics.height);
}
- Line &line = mLines[l1];
- pos = mCharPos[line.mChar0]-scroll;
- mHighlightGfx->drawRect(pos.x,pos.y,x1-pos.x,line.mMetrics.height);
}
}
mGfxDirty = false;
}
}
+void TextField::highlightRect(double x0, double y0, double w, double h)
+{
+ if (x0fieldWidth-GAP)
+ w = fieldWidth-GAP - x0;
+
+ if (w>0)
+ mHighlightGfx->drawRect(x0,y0,w,h);
+}
+
bool TextField::CaretOn()
{
Stage *s = getStage();
- return (s && isInput && s->GetFocusObject()==this && (( (int)(GetTimeStamp()*3)) & 1));
+ return (s && isInput && s->GetFocusObject()==this && !(( (int)((GetTimeStamp()-mBlink0)*3)) & 1));
}
bool TextField::IsCacheDirty()
@@ -1373,6 +1418,14 @@ bool TextField::IsCacheDirty()
}
+void TextField::toScreenGrid(UserPoint &ioPoint, const Matrix &inMatrix)
+{
+ ioPoint.x = floor((ioPoint.x-inMatrix.mtx)*fontScale+0.5)*fontToLocal+inMatrix.mtx;
+ ioPoint.y = floor((ioPoint.y-inMatrix.mty)*fontScale+0.5)*fontToLocal+inMatrix.mty;
+}
+
+
+
void TextField::Render( const RenderTarget &inTarget, const RenderState &inState )
{
@@ -1383,8 +1436,8 @@ void TextField::Render( const RenderTarget &inTarget, const RenderState &inState
RenderState state(inState);
- Rect r = mActiveRect.Rotated(mLayoutRotation).Translated(matrix.mtx,matrix.mty).RemoveBorder(2*mLayoutScaleH);
- state.mClipRect = r.Intersect(inState.mClipRect);
+ //Rect r = mActiveRect.Rotated(mLayoutRotation).Translated(matrix.mtx,matrix.mty).RemoveBorder(2*mLayoutScaleH);
+ //state.mClipRect = r.Intersect(inState.mClipRect);
if (inState.mMask)
state.mClipRect = inState.mClipRect.Intersect(
@@ -1406,8 +1459,9 @@ void TextField::Render( const RenderTarget &inTarget, const RenderState &inState
RenderState state(inState);
- Rect r = mActiveRect.Rotated(mLayoutRotation).Translated(matrix.mtx,matrix.mty).RemoveBorder(2*mLayoutScaleH);
- state.mClipRect = r.Intersect(inState.mClipRect);
+ // TODO - full transform
+ //Rect r = mActiveRect.Translated(matrix.mtx,matrix.mty).RemoveBorder(2*mLayoutScaleH);
+ //state.mClipRect = r.Intersect(inState.mClipRect);
if (inState.mMask)
state.mClipRect = inState.mClipRect.Intersect(
@@ -1420,13 +1474,13 @@ void TextField::Render( const RenderTarget &inTarget, const RenderState &inState
if (inState.mPhase==rpHitTest)
{
// Convert destination pixels to local pixels...
- UserPoint pos = TargetToRect(matrix,UserPoint(inState.mClipRect.x, inState.mClipRect.y) );
- if ( mActiveRect.Contains(pos) )
+ UserPoint pos = GlobalToLocal(UserPoint(inState.mClipRect.x, inState.mClipRect.y));
+ if (pos.x>=0 && pos.y>=0 && pos.x<=fieldWidth && pos.y<=fieldHeight)
inState.mHitResult = this;
return;
}
- ImagePoint scroll = GetScrollPos();
+ UserPoint scroll = GetScrollPos();
BuildBackground();
@@ -1435,144 +1489,180 @@ void TextField::Render( const RenderTarget &inTarget, const RenderState &inState
if (!gfx.empty())
gfx.Render(inTarget,inState);
- UserPoint origin = RectToTarget( matrix, UserPoint(mActiveRect.x, mActiveRect.y) );
- UserPoint dPdX(1,0);
- UserPoint dPdY(0,1);
- switch(mLayoutRotation)
- {
- case gr0: break;
- case gr90: dPdX = UserPoint(0,1); dPdY = UserPoint(-1,0); break;
- case gr180: dPdX = UserPoint(-1,0); dPdY = UserPoint(0,-1); break;
- case gr270: dPdX = UserPoint(0,-1); dPdY = UserPoint(1,0); break;
- }
-
bool highlight = mHighlightGfx && !mHighlightGfx->empty();
bool caret = CaretOn();
- // Setup matrix for going from Rect to Target
- Matrix rect_to_target;
- if (highlight || caret)
+ if (highlight)
+ mHighlightGfx->Render(inTarget,state);
+
+ if (caret && mCaretDirty)
{
- rect_to_target.m00 = dPdX.x;
- rect_to_target.m01 = dPdY.x;
- rect_to_target.mtx = origin.x;
- rect_to_target.m10 = dPdX.y;
- rect_to_target.m11 = dPdY.y;
- rect_to_target.mty = origin.y;
- state.mTransform.mMatrix = &rect_to_target;
+ mCaretDirty = false;
+ if (!mCaretGfx)
+ mCaretGfx = new Graphics(this,true);
+ else
+ mCaretGfx->clear();
- if (highlight)
- mHighlightGfx->Render(inTarget,state);
-
- if (caret)
+ int line = LineFromChar(caretIndex);
+ if (line>=0)
{
- if (!mCaretGfx)
- mCaretGfx = new Graphics(this,true);
- int line = LineFromChar(caretIndex);
- if (line>=0)
+ UserPoint pos = GetCursorPos() - scroll;
+ if (pos.x>=GAP-1 && pos.x<=fieldWidth-GAP+1 && pos.y>=GAP-1)
{
- int height = mLines[line].mMetrics.height;
- if (height!=mLastCaretHeight)
+ double height = mLines[line].mMetrics.height;
+ if (pos.y+height <= fieldHeight-GAP+1)
{
- mLastCaretHeight = height;
- mCaretGfx->clear();
- mCaretGfx->lineStyle(1,0x000000);
- mCaretGfx->moveTo(0,0);
- mCaretGfx->lineTo(0,mLastCaretHeight);
+ mCaretGfx->lineStyle(1, 0x000000 ,1.0, false, ssmOpenGL );
+ mCaretGfx->moveTo(pos.x,pos.y);
+ mCaretGfx->lineTo(pos.x,pos.y+height);
}
-
- ImagePoint pos = GetCursorPos() - scroll;
-
- rect_to_target.TranslateData(pos.x,pos.y);
- mCaretGfx->Render(inTarget,state);
}
}
}
mHasCaret = caret;
-
- HardwareRenderer *hardware = inTarget.IsHardware() ? inTarget.mHardware : 0;
-
- RenderTarget clipped;
- if (hardware)
- hardware->SetViewport(state.mClipRect);
- else
- clipped = inTarget.ClipRect( state.mClipRect );
-
-
- int line = 0;
- int last_line = mLines.size()-1;
- Surface *hardwareSurface = 0;
- uint32 hardwareTint = 0;
- for(int g=0;gTransform(group.mFormat->color(textColor) | 0xff000000);
- for(int c=0;cDecRef();
+ mTiles = 0;
+ }
+ }
+ else
+ {
+ if (!mTiles)
+ mTiles = new Graphics(this,true);
+ else
+ mTiles->clear();
+
+ int line = 0;
+ int last_line = mLines.size()-1;
+ Surface *fontSurface = 0;
+ uint32 hardwareTint = 0;
+ double clipRight = fieldWidth-GAP;
+
+ float white[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
+ float groupColour[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
+ float trans_2x2[4] = { fontToLocal, 0.0f, 0.0f, fontToLocal };
+ for(int g=0;gmActiveRect.h) break;
- while(line= cid)
- line++;
- pos.y += mLines[line].mMetrics.ascent;
-
- int a;
- Tile tile = group.mFont->GetGlyph( ch, a);
- UserPoint p = origin + dPdX*pos.x + dPdY*pos.y+ UserPoint(tile.mOx,tile.mOy);
- uint32 tint = cid>=mSelectMin && cidcolor(textColor);
+ groupColour[0] = tint.getRedFloat();
+ groupColour[1] = tint.getGreenFloat();
+ groupColour[2] = tint.getBlueFloat();
+ groupColour[3] = 1.0;
+ for(int c=0;cEndBitmapRender();
+ int cid = group.mChar0 + c;
+ UserPoint pos = mCharPos[cid]-scroll;
+ if (pos.x < clipRight)
+ {
+ while(line= cid)
+ line++;
+ double lineY = pos.y + mLines[line].mMetrics.ascent;
+ if (lineY>fieldHeight)
+ break;
+ if (pos.y>=GAP)
+ {
+ pos.y = lineY;
- hardwareSurface = tile.mSurface;
- hardwareTint = tint;
- hardware->BeginBitmapRender(tile.mSurface,tint);
+ int a;
+ Tile tile = group.mFont->GetGlyph( ch, a);
+
+ if (fontSurface!=tile.mSurface)
+ {
+ //if (fontSurface) mTiles->endTiles();
+ fontSurface = tile.mSurface;
+ mTiles->beginTiles(fontSurface,!screenGrid,bmNormal);
+ }
+
+ UserPoint p(pos.x+tile.mOx*fontToLocal,pos.y+tile.mOy*fontToLocal);
+ if (screenGrid)
+ {
+ toScreenGrid(p,matrix);
+ }
+
+ double right = p.x+tile.mRect.w*fontToLocal;
+ if (right>GAP)
+ {
+ float *tint = cid>=mSelectMin && cidclipRight)
+ {
+ r.w = (clipRight-GAP)*fontScale + 0.001;
+ if (r.w>0)
+ mTiles->tile(GAP,p.y,r,trans_2x2,tint);
+ }
+ else
+ {
+ mTiles->tile(GAP,p.y,r,trans_2x2,tint);
+ }
+
+ }
+ else if (right>clipRight)
+ {
+ Rect r = tile.mRect;
+ r.w = (clipRight-p.x)*fontScale + 0.001;
+ if (r.w>0)
+ mTiles->tile(p.x,p.y,r,trans_2x2,tint);
+ }
+ else
+ {
+ mTiles->tile(p.x,p.y,tile.mRect,trans_2x2,tint);
+ }
+ }
+ }
+ }
}
- hardware->RenderBitmap(tile.mRect, (int)p.x, (int)p.y);
- }
- else
- {
- tile.mSurface->BlitTo(clipped,
- tile.mRect, (int)p.x, (int)p.y,
- bmTinted, 0,
- (uint32)tint);
}
}
}
}
+
}
+ if (mTiles && !mTiles->empty())
+ mTiles->Render(inTarget,inState);
- if (hardwareSurface)
- hardware->EndBitmapRender();
+ if (caret && mCaretGfx && !mCaretGfx->empty())
+ mCaretGfx->Render(inTarget,state);
}
+
void TextField::GetExtent(const Transform &inTrans, Extent2DF &outExt,bool inForBitmap,bool inIncludeStroke)
{
Layout(*inTrans.mMatrix);
+ /*
if (inForBitmap && !border && !background)
{
- Rect r = mActiveRect.Rotated(mLayoutRotation).
- Translated(inTrans.mMatrix->mtx, inTrans.mMatrix->mty);
+ Rect r = mActiveRect.Translated(inTrans.mMatrix->mtx, inTrans.mMatrix->mty);
for(int corner=0;corner<4;corner++)
outExt.Add( UserPoint(((corner & 1) ? r.x : r.x1()),((corner & 1) ? r.y : r.y1())));
}
- else if (inForBitmap && border)
+ else
+ */
+ if (inForBitmap && border)
{
BuildBackground();
return DisplayObject::GetExtent(inTrans,outExt,inForBitmap,inIncludeStroke);
@@ -1581,11 +1671,10 @@ void TextField::GetExtent(const Transform &inTrans, Extent2DF &outExt,bool inFor
{
for(int corner=0;corner<4;corner++)
{
- //UserPoint pos((corner & 1) ? boundsWidth*mLayoutScaleH : 0,
- // (corner & 2) ? boundsHeight*mLayoutScaleV : 0);
- UserPoint pos((corner & 1) ? mActiveRect.x1() : mActiveRect.x,
- (corner & 2) ? mActiveRect.y1() : mActiveRect.y);
- outExt.Add( RectToTarget(*inTrans.mMatrix,pos) );
+ UserPoint pos((corner & 1) ? fieldWidth : 0, (corner & 2) ? fieldHeight: 0);
+ //UserPoint pos((corner & 1) ? mActiveRect.x1() : mActiveRect.x,
+ // (corner & 2) ? mActiveRect.y1() : mActiveRect.y);
+ outExt.Add( inTrans.mMatrix->Apply(pos.x,pos.y) );
}
}
}
@@ -1626,6 +1715,17 @@ void TextField::DeleteChars(int inFirst,int inEnd)
}
}
+void TextField::ClearSelection()
+{
+ if (mSelectMin!=mSelectMax)
+ {
+ mSelectMin = mSelectMax = 0;
+ mTilesDirty = true;
+ mCaretDirty = true;
+ mGfxDirty = true;
+ }
+}
+
void TextField::DeleteSelection()
{
if (mSelectMin>=mSelectMax)
@@ -1634,12 +1734,15 @@ void TextField::DeleteSelection()
caretIndex = mSelectMin;
mSelectMin = mSelectMax = 0;
mSelectKeyDown = -1;
+ mTilesDirty = true;
+ mCaretDirty = true;
mGfxDirty = true;
}
void TextField::InsertString(WString &inString)
{
- if (caretIndex<0) caretIndex = 0;
+ if (caretIndex<0)
+ caretIndex = 0;
caretIndex = std::min(caretIndex,getLength());
if (maxChars>0)
@@ -1674,74 +1777,68 @@ void TextField::InsertString(WString &inString)
Layout(GetFullMatrix(true));
}
+#ifdef EPPC
+ #define iswspace(x) isspace(x)
+#endif
+
+
static bool IsWord(int inCh)
{
- #ifdef EPPC
- return (!isspace(inCh));
- #else
- return (!iswspace(inCh));
- #endif
//return inCh<255 && (iswalpha(inCh) || isdigit(inCh) || inCh=='_');
-}
-
-static inline int Round6(int inX6)
-{
- return (inX6 + (1<<6) -1) >> 6;
+ // TODO - other breaks?
+ return !iswspace(inCh) && inCh!='-';
}
// Combine x,y scaling with rotation to calculate pixel coordinates for
// each character.
void TextField::Layout(const Matrix &inMatrix)
{
- GlyphRotation rot;
- double scale_h;
- double scale_v;
+ //double scale = scaleY<=0 ? 0.0 : sqrt( inMatrix.m10*inMatrix.m10 + inMatrix.m11*inMatrix.m11 )/scaleY;
+ double scale = sqrt( inMatrix.m10*inMatrix.m10 + inMatrix.m11*inMatrix.m11 );
+ bool grid = ( fabs(fabs(inMatrix.m10)-fabs(inMatrix.m10)))<0.0001 &&
+ fabs(fabs(inMatrix.m00)-fabs(inMatrix.m11))<0.0001 &&
+ ( fabs(inMatrix.m10)<0.0001 || fabs(inMatrix.m11)<0.0001);
- if (fabs(inMatrix.m00)> fabs(inMatrix.m01))
- {
- scale_h = fabs(inMatrix.m00);
- scale_v = fabs(inMatrix.m11);
- rot = inMatrix.m00 < 0 ? gr180 : gr0;
- }
- else
- {
- scale_h = fabs(inMatrix.m10);
- scale_v = fabs(inMatrix.m01);
- rot = inMatrix.m01 < 0 ? gr90 : gr270;
- }
-
-
- if (mFontsDirty || scale_h!=mLayoutScaleH || scale_v!=mLayoutScaleV ||
- rot!=mLayoutRotation)
+ if (mFontsDirty || fabs(scale-fontScale)>0.0001 || grid!=screenGrid)
{
+ // fontScale is local-to-pixel scale
+ fontScale = scale;
+ screenGrid = grid;
for(int i=0;iUpdateFont(scale_v,rot,!embedFonts);
+ mCharGroups[i]->UpdateFont(fontScale,!embedFonts);
+
mLinesDirty = true;
mFontsDirty = false;
- mLayoutScaleV = scale_v;
- mLayoutScaleH = scale_h;
- mLayoutRotation = rot;
+ fontToLocal = scale>0 ? 1.0/scale : 0.0;
}
if (!mLinesDirty)
return;
- //printf("Re-layout\n");
- // Now, layout into local co-ordinates...
+ double font6ToLocalX = fontToLocal/64.0;
+
mLines.resize(0);
mCharPos.resize(0);
- int gap = (int)(2.0*mLayoutScaleH+0.5);
+ if (scaleX==0 || scaleY==0)
+ return;
+
+
+ double oldW = fieldWidth;
+ double oldH = fieldHeight;
+
Line line;
int char_count = 0;
+ double charX = 0;
+ double charY = 0;
+ line.mY0 = charY;
+ mLastUpDownX = -1;
textHeight = 0;
textWidth = 0;
- int x6 = gap << 6;
- int y = gap;
- line.mY0 = y;
- mLastUpDownX = -1;
- int max_x = boundsWidth * mLayoutScaleH - gap;
- if (max_x<1) max_x = 1;
+ double max_x = autoSize!=asNone && !wordWrap ? 1e30 : fieldWidth - GAP*2.0;
+ if (max_x<1)
+ max_x = 1;
+ bool endsWidthNewLine = false;
for(int i=0;i>6,y) );
+ mCharPos.push_back( UserPoint(charX,charY) );
line.mChars++;
char_count++;
cid++;
+
if (!displayAsPassword && !iswalpha(ch) && !isdigit(ch) && ch!='_' && ch!=';' && ch!='.' && ch!=',' && ch!='"' && ch!=':' && ch!='\'' && ch!='!' && ch!='?')
{
- if (!IsWord(ch) || (line.mChars>2 && !IsWord(g.mString[cid-2])) )
+ if (!IsWord(ch) || (cid>=2 && !IsWord(g.mString[cid-2])) )
{
- #ifdef EPPC
- if ( (ch<255 && isspace(ch)) || line.mChars==1)
- #else
- if ( (ch<255 && iswspace(ch)) || line.mChars==1)
- #endif
+ if ( (ch<255 && !IsWord(ch)) || line.mChars==1)
{
last_word_cid = cid;
last_word_line_chars = line.mChars;
@@ -1791,30 +1887,34 @@ void TextField::Layout(const Matrix &inMatrix)
last_word_cid = cid-1;
last_word_line_chars = line.mChars-1;
}
- last_word_x6 = x6;
+ last_word_x = charX;
}
-
+
if (ch=='\n' || ch=='\r')
{
// New line ...
+ line.mMetrics.fontToLocal(fontToLocal);
+ if (i+1leading;
+ charY += line.mMetrics.height;
mLines.push_back(line);
line.Clear();
- g.UpdateMetrics(line.mMetrics);
- y += g.Height() + g.mFormat->leading + 1;
+ endsWidthNewLine = true;
continue;
}
}
-
- int ox6 = x6;
+
+ double ox = charX;
if (displayAsPassword)
ch = gPasswordChar;
if (g.mFont)
- g.mFont->GetGlyph( ch, advance );
+ g.mFont->GetGlyph( ch, advance6 );
else
- advance = 0;
- x6 += advance;
- //printf(" Char %c (%d..%d/%d,%d) %p\n", ch, ox, x, max_x, y, g.mFont);
- if ( !displayAsPassword && (wordWrap) && Round6(x6) > max_x && line.mChars>1)
+ advance6 = 0;
+ charX += advance6*font6ToLocalX;
+
+ //printf(" Char %c (%d..%d/%d,%d) %p\n", ch, ox, x, max_x, charY, g.mFont);
+ if ( !displayAsPassword && (wordWrap) && charX > max_x && line.mChars>1)
{
// No break on line so far - just back up 1 character....
if (last_word_line_chars==0 || !wordWrap)
@@ -1823,7 +1923,7 @@ void TextField::Layout(const Matrix &inMatrix)
line.mChars--;
char_count--;
mCharPos.qpop();
- line.mMetrics.width = Round6(ox6);
+ line.mMetrics.width = ox;
}
else
{
@@ -1832,78 +1932,80 @@ void TextField::Layout(const Matrix &inMatrix)
char_count-= line.mChars - last_word_line_chars;
mCharPos.resize(char_count);
line.mChars = last_word_line_chars;
- line.mMetrics.width = Round6(last_word_x6);
+ line.mMetrics.width = last_word_x;
}
+ line.mMetrics.fontToLocal(fontToLocal);
+ if (i+1leading;
+ charY += line.mMetrics.height;
+ charX = 0;
mLines.push_back(line);
- y += g.Height() + g.mFormat->leading + 1;
- x6 = gap<<6;
line.Clear();
g.UpdateMetrics(line.mMetrics);
continue;
}
- int x = Round6(x6);
- line.mMetrics.width = x;
- if (x>textWidth)
- textWidth = x;
+ double right = charX;
+ if (screenGrid)
+ right = ((int)((right*fontScale+0.999)))*fontToLocal;
+ line.mMetrics.width = right;
+ if (right>textWidth)
+ textWidth = right;
}
}
- textWidth += gap;
- if (line.mChars || mLines.empty())
+
+ if ((endsWidthNewLine && multiline) || line.mChars || mLines.empty())
{
- mCharGroups[mCharGroups.size()-1]->UpdateMetrics(line.mMetrics);
- y += line.mMetrics.height;
+ CharGroup *last=mCharGroups[mCharGroups.size()-1];
+ last->UpdateMetrics(line.mMetrics);
+ line.mMetrics.fontToLocal(fontToLocal);
+ if (endsWidthNewLine)
+ {
+ line.mY0 = charY;
+ line.mChar0 = char_count;
+ line.mChars = 0;
+ line.mCharGroup0 = mCharGroups.size()-1;
+ line.mCharInGroup0 = last->mString.size();
+ }
+ charY += line.mMetrics.height;
mLines.push_back(line);
}
- textHeight = y + gap;
-
- int max_y = boundsHeight * mLayoutScaleV;
- if (autoSize != asNone)
+ textHeight = charY;
+ //printf("textHeight = %f\n", textHeight);
+ if (autoSize!=asNone)
{
- //if (!wordWrap) - still use this, even if wordWrap
+ if (!wordWrap)
{
- switch(autoSize)
- {
- case asNone: break;
- case asLeft: mActiveRect.w = textWidth;
- break;
- case asRight: mActiveRect.x = mActiveRect.x1()-textWidth - gap;
- mActiveRect.w = textWidth;
- break;
- case asCenter: mActiveRect.x = (mActiveRect.x+mActiveRect.x1()-textWidth)/2;
- mActiveRect.w = textWidth;
- break;
- }
- if (autoSize!=asNone)
- {
- boundsHeight = textHeight/mLayoutScaleV;
- }
+ fieldWidth = textWidth + 2.0*GAP;
+ if (screenGrid)
+ fieldWidth += 1;
}
- max_y = mActiveRect.h = textHeight;
+ fieldHeight = textHeight + 2.0*GAP;
+ if (screenGrid)
+ fieldHeight += 1;
}
- else
- mActiveRect = Rect(0,0,boundsWidth*mLayoutScaleH+0.99,boundsHeight*mLayoutScaleV+0.99);
- maxScrollH = std::max(0,textWidth-max_x);
+ maxScrollH = std::max(0.0,textWidth-(fieldWidth-GAP*2));
maxScrollV = 1;
// Work out how many lines from the end fit in the rect, and
// therefore how many lines we can scroll...
- if (textHeight>max_y && mLines.size()>1)
+ double clippedHeight = fieldHeight - 2.0*GAP;
+ int last = mLines.size()-1;
+ if (textHeight>fieldHeight && mLines.size()>1)
{
- int window_height = max_y-3*gap;
- int line = mLines.size()-1;
- int lines_height = mLines[line].mMetrics.height;
- while( line < window_height && line>0 )
+ int lines_visible = 0;
+ double lines_height = mLines[last-lines_visible].mMetrics.height;
+ lines_visible++;
+
+ while( lines_visible window_height)
- break;
- lines_height += mLines[--line].mMetrics.height;
+ lines_height += mLines[last-lines_visible].mMetrics.height;
+ lines_visible++;
}
- maxScrollV = line+1;
+ maxScrollV = mLines.size() - lines_visible + 1;
}
// Align rows ...
@@ -1916,23 +2018,35 @@ void TextField::Layout(const Matrix &inMatrix)
CharGroup &group = *mCharGroups[line.mCharGroup0];
// Get alignment...
- int extra = (mActiveRect.w - line.mMetrics.width - 1);
+ double extra = (fieldWidth - line.mMetrics.width);
switch(group.mFormat->align(tfaLeft))
{
- case tfaJustify: break;
- case tfaRight: break;
- case tfaLeft: extra = 0; break;
- case tfaCenter: extra/=2; break;
+ case tfaJustify:
+ case tfaRight:
+ extra -= GAP;
+ break;
+ case tfaLeft:
+ extra = GAP;
+ break;
+ case tfaCenter:
+ extra*=0.5;
+ break;
}
- if (extra>0)
- {
+ if (extra)
for(int c=0; cDecRef();
}
-bool CharGroup::UpdateFont(double inScale,GlyphRotation inRotation,bool inNative)
+bool CharGroup::UpdateFont(double inScale,bool inNative)
{
int h = 0.5 + inScale*mFormat->size;
- if (!mFont || h!=mFontHeight || mFont->IsNative()!=inNative || mFont->Rotation()!=inRotation)
+ if (!mFont || h!=mFontHeight )
{
- if (mFont)
- mFont->DecRef();
- mFont = Font::Create(*mFormat,inScale,inRotation,inNative,true);
+ Font *oldFont = mFont;
+ mFont = Font::Create(*mFormat,inScale,inNative,true);
+ if (oldFont)
+ oldFont->DecRef();
mFontHeight = h;
return true;
}
diff --git a/legacy/project/src/common/Tilesheet.cpp b/legacy/project/src/common/Tilesheet.cpp
index af14120f8..0d45f8a7b 100644
--- a/legacy/project/src/common/Tilesheet.cpp
+++ b/legacy/project/src/common/Tilesheet.cpp
@@ -29,7 +29,7 @@ Tilesheet::~Tilesheet()
mSheet->DecRef();
}
-int Tilesheet::AllocRect(int inW,int inH,float inOx, float inOy)
+int Tilesheet::AllocRect(int inW,int inH,float inOx, float inOy,bool inAlphaBorder)
{
Tile tile;
tile.mOx = inOx;
@@ -37,13 +37,19 @@ int Tilesheet::AllocRect(int inW,int inH,float inOx, float inOy)
tile.mSurface = mSheet;
// does it fit on the current row ?
- if (mCurrentX + inW <= mSheet->Width() && mCurrentY + inH < mSheet->Height())
+ int cx = mCurrentX;
+ if (inAlphaBorder && cx>0)
+ cx++;
+ int cy = mCurrentY;
+ if (inAlphaBorder && cy>0)
+ cy++;
+ if (cx + inW <= mSheet->Width() && cy + inH < mSheet->Height())
{
- tile.mRect = Rect(mCurrentX, mCurrentY, inW, inH);
+ tile.mRect = Rect(cx, cy, inW, inH);
int result = mTiles.size();
mTiles.push_back(tile);
- mCurrentX += inW;
- mMaxHeight = std::max(mMaxHeight,inH);
+ mCurrentX = cx+inW;
+ mMaxHeight = std::max(mMaxHeight,inH+cy-mCurrentY);
return result;
}
// No - go to next row
diff --git a/legacy/project/src/common/Utils.cpp b/legacy/project/src/common/Utils.cpp
index 76567e822..f42ed6c2b 100644
--- a/legacy/project/src/common/Utils.cpp
+++ b/legacy/project/src/common/Utils.cpp
@@ -201,14 +201,22 @@ std::string WideToUTF8(const WString &inWideString)
WString IntToWide(int value)
{
wchar_t buffer[16];
+ #ifdef __MINGW32__
+ swprintf(buffer, L"%i", value);
+ #else
swprintf(buffer, 16, L"%i", value);
+ #endif
return WString(buffer);
}
WString ColorToWide(int value)
{
wchar_t buffer[40];
- swprintf(buffer, 40, L"%X", value);
+ #ifdef __MINGW32__
+ swprintf(buffer, L"%X", value);
+ #else
+ swprintf(buffer, 40, L"%i", value);
+ #endif
return WString(buffer);
}
@@ -390,6 +398,15 @@ void GetSpecialDir(SpecialDir inDir,std::string &outDir)
}
else
{
+ #ifdef __MINGW32__
+ #ifndef CSIDL_MYDOCUMENTS
+ #define CSIDL_MYDOCUMENTS CSIDL_PERSONAL
+ #endif
+ #ifndef SHGFP_TYPE_CURRENT
+ #define SHGFP_TYPE_CURRENT 0
+ #endif
+ #endif
+
int id_lut[] = { 0, CSIDL_APPDATA, CSIDL_DESKTOPDIRECTORY, CSIDL_MYDOCUMENTS, CSIDL_PROFILE, 0 };
SHGetFolderPath(NULL, id_lut[inDir], NULL, SHGFP_TYPE_CURRENT, result);
outDir = result;
diff --git a/legacy/project/src/common/XML/tinyxml.h b/legacy/project/src/common/XML/tinyxml.h
index 86475eff7..ca155ddf0 100644
--- a/legacy/project/src/common/XML/tinyxml.h
+++ b/legacy/project/src/common/XML/tinyxml.h
@@ -65,7 +65,11 @@ distribution.
#define TIXML_SAFE
#ifdef TIXML_SAFE
- #if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+ #if defined(__MINGW32__)
+ #define TIXML_SNPRINTF snwprintf
+ //#define TIXML_SNSCANF snscanf
+ #define TIXML_SSCANF swscanf
+ #elif defined(_MSC_VER) && (_MSC_VER >= 1400 ) || defined(__MINGW32__)
// Microsoft visual studio, version 2005 and higher.
#define TIXML_SNPRINTF _snwprintf_s
//#define TIXML_SNSCANF _snwscanf_s
@@ -76,7 +80,7 @@ distribution.
#define TIXML_SNPRINTF _snprintf
//#define TIXML_SNSCANF _snscanf
#define TIXML_SSCANF sscanf
- #elif defined(__GNUC__) && (__GNUC__ >= 3 )
+ #elif (defined(__GNUC__) && (__GNUC__ >= 3 ))
// GCC version 3 and higher.s
//#warning( L"Using sn* functions." )
#define TIXML_SNPRINTF swprintf
diff --git a/legacy/project/src/opengl/OGL.h b/legacy/project/src/opengl/OGL.h
index 26e348e40..4221fa15a 100644
--- a/legacy/project/src/opengl/OGL.h
+++ b/legacy/project/src/opengl/OGL.h
@@ -66,7 +66,11 @@
#include
#include
//#define FORCE_NON_PO2
+#ifdef __MINGW32__
+#include
+#endif
typedef ptrdiff_t GLsizeiptrARB;
+
#define NEED_EXTENSIONS
#include
#include
diff --git a/legacy/project/src/opengl/OGLExport.cpp b/legacy/project/src/opengl/OGLExport.cpp
index 177e6d571..721ffe63c 100644
--- a/legacy/project/src/opengl/OGLExport.cpp
+++ b/legacy/project/src/opengl/OGLExport.cpp
@@ -9,6 +9,7 @@
#ifdef ANDROID
#include
+#include
#endif
#include
@@ -404,6 +405,37 @@ value nme_gl_get_supported_extensions(value ioList)
DEFINE_PRIM(nme_gl_get_supported_extensions,1);
+value nme_gl_get_extension(value inName)
+{
+ void *result = 0;
+ const char *name = val_string(inName);
+
+ #ifdef HX_WINDOWS
+ result = (void *)wglGetProcAddress(name);
+ #elif defined(ANDROID)
+ result = (void *)eglGetProcAddress(name);
+ //Wait until I can test this...
+ //#elif defined(HX_LINUX)
+ // result = dlsym(nme::gOGLLibraryHandle,#func);
+ #endif
+
+ if (result)
+ {
+ static bool init = false;
+ static vkind functionKind;
+ if (!init==0)
+ {
+ init = true;
+ kind_share(&functionKind,"function");
+ }
+ return alloc_abstract(functionKind,result);
+ }
+
+ return alloc_null();
+}
+DEFINE_PRIM(nme_gl_get_extension,1);
+
+
value nme_gl_front_face(value inFace)
{
glFrontFace(val_int(inFace));
diff --git a/legacy/project/src/opengl/OpenGLContext.cpp b/legacy/project/src/opengl/OpenGLContext.cpp
index daf97c49a..b01274a62 100644
--- a/legacy/project/src/opengl/OpenGLContext.cpp
+++ b/legacy/project/src/opengl/OpenGLContext.cpp
@@ -678,7 +678,7 @@ public:
{
// TODO mQuality -> tessellate_lines/tessellate_lines_aa
mLineWidth = inWidth;
- glLineWidth(inWidth);
+ glLineWidth(inWidth<=0.25 ? 0.25 : inWidth);
}
}
diff --git a/legacy/project/src/sdl2/SDL2Stage.cpp b/legacy/project/src/sdl2/SDL2Stage.cpp
index 15cbcca5a..cccc9b013 100644
--- a/legacy/project/src/sdl2/SDL2Stage.cpp
+++ b/legacy/project/src/sdl2/SDL2Stage.cpp
@@ -958,6 +958,7 @@ void AddCharCode(Event &key)
switch (key.value)
{
case 8:
+ case 9:
case 13:
case 27:
case 32:
diff --git a/legacy/project/src/software-renderer/AlphaMask.h b/legacy/project/src/software-renderer/AlphaMask.h
index d701b98bd..5998fcf14 100644
--- a/legacy/project/src/software-renderer/AlphaMask.h
+++ b/legacy/project/src/software-renderer/AlphaMask.h
@@ -112,6 +112,7 @@ public:
virtual void Fill(const AlphaMask &mAlphaMask, int inTX, int inTY, const RenderTarget &inTarget, const RenderState &inState) = 0;
virtual void SetMapping(const UserPoint *inVertex, const float *inUVT, int inComponents) { }
+ virtual void SetTint(ARGB inTint) { }
static Filler *Create(GraphicsSolidFill *inFill);
static Filler *Create(GraphicsGradientFill *inFill);
diff --git a/legacy/project/src/software-renderer/BitmapFill.cpp b/legacy/project/src/software-renderer/BitmapFill.cpp
index 5cd69fdfd..13e4d13d1 100644
--- a/legacy/project/src/software-renderer/BitmapFill.cpp
+++ b/legacy/project/src/software-renderer/BitmapFill.cpp
@@ -7,10 +7,12 @@ namespace nme
template
static Filler *CreateAlpha(GraphicsBitmapFill *inFill)
{
- if (inFill->bitmapData->Format() & pfHasAlpha)
- return new BitmapFiller(inFill);
+ if (inFill->bitmapData->Format() == pfAlpha)
+ return new BitmapFiller(inFill);
+ else if (inFill->bitmapData->Format() & pfHasAlpha)
+ return new BitmapFiller(inFill);
else
- return new BitmapFiller(inFill);
+ return new BitmapFiller(inFill);
}
diff --git a/legacy/project/src/software-renderer/BitmapFill.h b/legacy/project/src/software-renderer/BitmapFill.h
index 3364d9688..1ac1f7914 100644
--- a/legacy/project/src/software-renderer/BitmapFill.h
+++ b/legacy/project/src/software-renderer/BitmapFill.h
@@ -12,81 +12,12 @@ static inline bool IsPOW2(int inX)
enum { EDGE_CLAMP, EDGE_REPEAT, EDGE_POW2 };
-
-#define GET_PIXEL_POINTERS \
- int frac_x = (mPos.x & 0xff00) >> 8; \
- int frac_y = (mPos.y & 0xff00) >> 8; \
- \
- if (EDGE == EDGE_CLAMP) \
- { \
- int x_step = 4; \
- int y_step = mStride; \
- \
- if (x<0) { x_step = x = 0; } \
- else if (x>=mW1) { x_step = 0; x = mW1; } \
- \
- if (y<0) { y_step = y = 0; } \
- else if (y>=mH1) { y_step = 0; y = mH1; } \
- \
- const uint8 * ptr = mBase + y*mStride + x*4; \
- p00 = *(ARGB *)ptr; \
- p01 = *(ARGB *)(ptr + x_step); \
- p10 = *(ARGB *)(ptr + y_step); \
- p11 = *(ARGB *)(ptr + y_step + x_step); \
- } \
- else if (EDGE==EDGE_POW2) \
- { \
- const uint8 *p = mBase + (y&mH1)*mStride; \
- \
- p00 = *(ARGB *)(p+ (x & mW1)*4); \
- p01 = *(ARGB *)(p+ ((x+1) & mW1)*4); \
- \
- p = mBase + ( (y+1) &mH1)*mStride; \
- p10 = *(ARGB *)(p+ (x & mW1)*4); \
- p11 = *(ARGB *)(p+ ((x+1) & mW1)*4); \
- } \
- else \
- { \
- int x1 = ((x+1) % mWidth) * 4; \
- if (x1<0) x1+=mWidth; \
- x = (x % mWidth)*4; \
- if (x<0) x+=mWidth; \
- \
- int y0= (y%mHeight); if (y0<0) y0+=mHeight; \
- const uint8 *p = mBase + y0*mStride; \
- \
- p00 = *(ARGB *)(p+ x); \
- p01 = *(ARGB *)(p+ x1); \
-\
- int y1= ((y+1)%mHeight); if (y1<0) y1+=mHeight; \
- p = mBase + y1*mStride; \
- p10 = *(ARGB *)(p+ x); \
- p11 = *(ARGB *)(p+ x1); \
- }
-
-
-
-#define MODIFY_EDGE_XY \
- if (EDGE == EDGE_CLAMP) \
- { \
- if (x<0) x = 0; \
- else if (x>=mWidth) x = mW1; \
- \
- if (y<0) y = 0; \
- else if (y>=mHeight) y = mH1; \
- } \
- else if (EDGE == EDGE_POW2) \
- { \
- x &= mW1; \
- y &= mH1; \
- } \
- else if (EDGE == EDGE_REPEAT) \
- { \
- x = x % mWidth; if (x<0) x+=mWidth;\
- y = y % mHeight; if (y<0) y+=mHeight;\
- }
-
-
+enum FillAlphaMode
+{
+ FillAlphaIgnore,
+ FillAlphaHas,
+ FillAlphaIs,
+};
@@ -104,6 +35,7 @@ public:
mMapped = false;
mPerspective = false;
mBilinearAdjust = 0;
+ mTint = ARGB(0xffffffff);
}
@@ -121,6 +53,9 @@ public:
mDPyDX = (int)(mMapper.m10 * (1<<16)+ 0.5);
}
+ void SetTint(ARGB inTint) { mTint = inTint; }
+
+
void SetMapping(const UserPoint *inVertex, const float *inUVT,int inComponents)
{
mMapped = true;
@@ -246,15 +181,17 @@ public:
double mTX, mTY, mTW;
double mBilinearAdjust;
Matrix mMapper;
+ ARGB mTint;
GraphicsBitmapFill *mBitmap;
};
-template
+template
class BitmapFiller : public BitmapFillerBase
{
public:
- enum { HasAlpha = HAS_ALPHA };
+ enum { HasAlpha = FILL_ALPHA!=FillAlphaIgnore };
+ enum { AlphaMode = FILL_ALPHA };
BitmapFiller(GraphicsBitmapFill *inFill) : BitmapFillerBase(inFill)
{
@@ -273,43 +210,154 @@ public:
mTY += mMapper.m10;
mTW += mWX;
}
+
int x = mPos.x >> 16;
int y = mPos.y >> 16;
if (SMOOTH)
{
ARGB result;
- ARGB p00,p01,p10,p11;
-
- GET_PIXEL_POINTERS
+ int frac_x = (mPos.x & 0xff00) >> 8;
+ int frac_y = (mPos.y & 0xff00) >> 8;
if (!PERSP)
{
mPos.x += mDPxDX;
mPos.y += mDPyDX;
}
-
- int y0r = (p00.r<<8) + (p01.r-p00.r) * frac_x;
- int y1r = (p10.r<<8) + (p11.r-p10.r) * frac_x;
- result.r = ((y0r<<8) + (y1r-y0r) * frac_y)>>16;
- int y0g = (p00.g<<8) + (p01.g-p00.g) * frac_x;
- int y1g = (p10.g<<8) + (p11.g-p10.g) * frac_x;
- result.g = ((y0g<<8) + (y1g-y0g) * frac_y)>>16;
-
- int y0b = (p00.b<<8) + (p01.b-p00.b) * frac_x;
- int y1b = (p10.b<<8) + (p11.b-p10.b) * frac_x;
- result.b = ((y0b<<8) + (y1b-y0b) * frac_y)>>16;
-
- if (HAS_ALPHA)
+ if ((FillAlphaMode)AlphaMode==FillAlphaIs)
{
- int y0a = (p00.a<<8) + (p01.a-p00.a) * frac_x;
- int y1a = (p10.a<<8) + (p11.a-p10.a) * frac_x;
+ int a00,a01,a10,a11;
+
+ if (EDGE == EDGE_CLAMP)
+ {
+ int x_step = 1;
+ int y_step = mStride;
+
+ if (x<0) { x_step = x = 0; }
+ else if (x>=mW1) { x_step = 0; x = mW1; }
+
+ if (y<0) { y_step = y = 0; }
+ else if (y>=mH1) { y_step = 0; y = mH1; }
+
+ const uint8 * ptr = mBase + y*mStride + x;
+ a00 = ptr[0];
+ a01 = ptr[x_step];
+ a10 = ptr[y_step];
+ a11 = ptr[y_step + x_step];
+ }
+ else if (EDGE==EDGE_POW2)
+ {
+ const uint8 *p = mBase + (y&mH1)*mStride;
+
+ a00 = *(p+ (x & mW1));
+ a01 = *(p+ ((x+1) & mW1));
+
+ p = mBase + ( (y+1) &mH1)*mStride;
+ a10 = *(p+ (x & mW1));
+ a11 = *(p+ ((x+1) & mW1));
+ }
+ else
+ {
+ int x1 = ((x+1) % mWidth);
+ if (x1<0) x1+=mWidth;
+ x = (x % mWidth);
+ if (x<0) x+=mWidth;
+
+ int y0= (y%mHeight); if (y0<0) y0+=mHeight;
+ const uint8 *p = mBase + y0*mStride;
+
+ a00 = *(p+ x);
+ a01 = *(p+ x1);
+
+ int y1= ((y+1)%mHeight); if (y1<0) y1+=mHeight;
+ p = mBase + y1*mStride;
+ a10 = *(p+ x);
+ a11 = *(p+ x1);
+ }
+
+ int y0a = (a00<<8) + (a01-a00) * frac_x;
+ int y1a = (a10<<8) + (a11-a10) * frac_x;
+ result = mTint;
result.a = ((y0a<<8) + (y1a-y0a) * frac_y)>>16;
+
+ return result;
}
else
{
- result.a = 255;
+ ARGB p00,p01,p10,p11;
+
+ if (EDGE == EDGE_CLAMP)
+ {
+ int x_step = 4;
+ int y_step = mStride;
+
+ if (x<0) { x_step = x = 0; }
+ else if (x>=mW1) { x_step = 0; x = mW1; }
+
+ if (y<0) { y_step = y = 0; }
+ else if (y>=mH1) { y_step = 0; y = mH1; }
+
+ const uint8 * ptr = mBase + y*mStride + x*4;
+ p00 = *(ARGB *)ptr;
+ p01 = *(ARGB *)(ptr + x_step);
+ p10 = *(ARGB *)(ptr + y_step);
+ p11 = *(ARGB *)(ptr + y_step + x_step);
+ }
+ else if (EDGE==EDGE_POW2)
+ {
+ const uint8 *p = mBase + (y&mH1)*mStride;
+
+ p00 = *(ARGB *)(p+ (x & mW1)*4);
+ p01 = *(ARGB *)(p+ ((x+1) & mW1)*4);
+
+ p = mBase + ( (y+1) &mH1)*mStride;
+ p10 = *(ARGB *)(p+ (x & mW1)*4);
+ p11 = *(ARGB *)(p+ ((x+1) & mW1)*4);
+ }
+ else
+ {
+ int x1 = ((x+1) % mWidth) * 4;
+ if (x1<0) x1+=mWidth;
+ x = (x % mWidth)*4;
+ if (x<0) x+=mWidth;
+
+ int y0= (y%mHeight); if (y0<0) y0+=mHeight;
+ const uint8 *p = mBase + y0*mStride;
+
+ p00 = *(ARGB *)(p+ x);
+ p01 = *(ARGB *)(p+ x1);
+
+ int y1= ((y+1)%mHeight); if (y1<0) y1+=mHeight;
+ p = mBase + y1*mStride;
+ p10 = *(ARGB *)(p+ x);
+ p11 = *(ARGB *)(p+ x1);
+ }
+
+
+ int y0r = (p00.r<<8) + (p01.r-p00.r) * frac_x;
+ int y1r = (p10.r<<8) + (p11.r-p10.r) * frac_x;
+ result.r = ((y0r<<8) + (y1r-y0r) * frac_y)>>16;
+
+ int y0g = (p00.g<<8) + (p01.g-p00.g) * frac_x;
+ int y1g = (p10.g<<8) + (p11.g-p10.g) * frac_x;
+ result.g = ((y0g<<8) + (y1g-y0g) * frac_y)>>16;
+
+ int y0b = (p00.b<<8) + (p01.b-p00.b) * frac_x;
+ int y1b = (p10.b<<8) + (p11.b-p10.b) * frac_x;
+ result.b = ((y0b<<8) + (y1b-y0b) * frac_y)>>16;
+
+ if ((FillAlphaMode)AlphaMode==FillAlphaHas)
+ {
+ int y0a = (p00.a<<8) + (p01.a-p00.a) * frac_x;
+ int y1a = (p10.a<<8) + (p11.a-p10.a) * frac_x;
+ result.a = ((y0a<<8) + (y1a-y0a) * frac_y)>>16;
+ }
+ else
+ {
+ result.a = 255;
+ }
}
return result;
@@ -321,8 +369,36 @@ public:
mPos.x += mDPxDX;
mPos.y += mDPyDX;
}
- MODIFY_EDGE_XY;
- return *(ARGB *)( mBase + y*mStride + x*4);
+
+ if (EDGE == EDGE_CLAMP)
+ {
+ if (x<0) x = 0;
+ else if (x>=mWidth) x = mW1;
+
+ if (y<0) y = 0;
+ else if (y>=mHeight) y = mH1;
+ }
+ else if (EDGE == EDGE_POW2)
+ {
+ x &= mW1;
+ y &= mH1;
+ }
+ else if (EDGE == EDGE_REPEAT)
+ {
+ x = x % mWidth; if (x<0) x+=mWidth;
+ y = y % mHeight; if (y<0) y+=mHeight;
+ }
+
+ if ((FillAlphaMode)AlphaMode==FillAlphaIs)
+ {
+ ARGB result(mTint);
+ result.a = *( mBase + y*mStride + x);
+ return result;
+ }
+ else
+ {
+ return *(ARGB *)( mBase + y*mStride + x*4);
+ }
}
}
diff --git a/legacy/project/src/software-renderer/BitmapFillPerspective.cpp b/legacy/project/src/software-renderer/BitmapFillPerspective.cpp
index 0b7291adc..829c90af4 100644
--- a/legacy/project/src/software-renderer/BitmapFillPerspective.cpp
+++ b/legacy/project/src/software-renderer/BitmapFillPerspective.cpp
@@ -7,10 +7,12 @@ namespace nme
template
static Filler *CreateAlpha(GraphicsBitmapFill *inFill)
{
- if (inFill->bitmapData->Format() & pfHasAlpha)
- return new BitmapFiller(inFill);
+ if (inFill->bitmapData->Format() == pfAlpha)
+ return new BitmapFiller(inFill);
+ else if (inFill->bitmapData->Format() & pfHasAlpha)
+ return new BitmapFiller(inFill);
else
- return new BitmapFiller(inFill);
+ return new BitmapFiller(inFill);
}
diff --git a/legacy/project/src/software-renderer/TileRenderer.cpp b/legacy/project/src/software-renderer/TileRenderer.cpp
index 00d8e7d0d..4d65bc943 100644
--- a/legacy/project/src/software-renderer/TileRenderer.cpp
+++ b/legacy/project/src/software-renderer/TileRenderer.cpp
@@ -35,9 +35,9 @@ struct TileData
{
UserPoint rg = inPoint[0];
UserPoint ba = inPoint[1];
- mColour = ((rg.x<0 ? 0 : rg.x>1?255 : (int)(rg.x*255))) |
+ mColour = ((rg.x<0 ? 0 : rg.x>1?255 : (int)(rg.x*255))<<16) |
((rg.y<0 ? 0 : rg.y>1?255 : (int)(rg.y*255))<<8) |
- ((ba.x<0 ? 0 : ba.x>1?255 : (int)(ba.x*255))<<16) |
+ ((ba.x<0 ? 0 : ba.x>1?255 : (int)(ba.x*255))) |
((ba.y<0 ? 0 : ba.y>1?255 : (int)(ba.y*255))<<24);
}
}
@@ -164,7 +164,12 @@ public:
UserPoint corner(data.mPos);
UserPoint pos = inState.mTransform.mMatrix->Apply(corner.x,corner.y);
- if ( (is_stretch || data.mHasTrans) )
+ if (s->Format()==pfAlpha && !is_stretch && mBlendMode==bmNormal && data.mHasColour /* integer co-ordinate?*/ )
+ {
+ unsigned int col = inState.mColourTransform->Transform(data.mColour|0xff000000);
+ s->BlitTo(inTarget, data.mRect, (int)(pos.x), (int)(pos.y), blend, 0, col);
+ }
+ else if ( (is_stretch || data.mHasTrans) )
{
// Can use stretch if there is no skew and no colour transform...
if (!data.mHasColour && (!data.mHasTrans) && mBlendMode==bmNormal )
@@ -236,8 +241,8 @@ public:
SpanRect *span = new SpanRect(alpha_rect,aa);
for(int i=0;i<4;i++)
span->Line00(
- Fixed10( p[i].x + 0.5 , p[i].y + 0.5 ),
- Fixed10( p[(i+1)&3].x + 0.5 , p[(i+1)&3].y + 0.5 ) );
+ Fixed10( p[i].x, p[i].y ),
+ Fixed10( p[(i+1)&3].x, p[(i+1)&3].y) );
AlphaMask *alpha = span->CreateMask(inState.mTransform,tile_alpha);
delete span;
@@ -250,11 +255,20 @@ public:
uvt[4] = (data.mRect.x + data.mRect.w) * bmp_scale_x;
uvt[5] = (data.mRect.y + data.mRect.h) * bmp_scale_y;
mFiller->SetMapping(p,uvt,2);
-
+
// Can render straight to surface ....
if (!offscreen_buffer)
{
- if (data.mHasTrans && !just_alpha)
+ if (s->Format()==pfAlpha)
+ {
+ if (data.mHasColour)
+ {
+ ARGB col = inState.mColourTransform->Transform(data.mColour|0xff000000);
+ mFiller->SetTint(col);
+ }
+ mFiller->Fill(*alpha,0,0,inTarget,inState);
+ }
+ else if (data.mHasTrans && !just_alpha)
{
ColorTransform buf;
RenderState col_state(inState);
@@ -277,6 +291,14 @@ public:
{
AutoSurfaceRender tmp_render(tmp);
const RenderTarget &target = tmp_render.Target();
+
+ if (s->Format()==pfAlpha && data.mHasColour)
+ {
+ ARGB col = inState.mColourTransform->Transform(data.mColour|0xff000000);
+ mFiller->SetTint(col);
+ }
+
+
mFiller->Fill(*alpha,0,0,target,inState);
}
diff --git a/legacy/project/src/windows/CaptureDevice.cpp b/legacy/project/src/windows/CaptureDevice.cpp
index aad747342..a866da2f8 100644
--- a/legacy/project/src/windows/CaptureDevice.cpp
+++ b/legacy/project/src/windows/CaptureDevice.cpp
@@ -1,3 +1,5 @@
+#ifndef __MINGW32__
+
#include
#include
#include
@@ -491,3 +493,18 @@ Camera *CreateCamera(const char *inName)
} // end namespace name
+#else // __MINGW__
+
+
+#include
+namespace nme
+{
+
+Camera *CreateCamera(const char *inName)
+{
+ return 0;
+}
+
+} // end namespace name
+
+#endif
diff --git a/legacy/project/src/windows/GDIFont.cpp b/legacy/project/src/windows/GDIFont.cpp
index 979f7652c..59e0f00e6 100644
--- a/legacy/project/src/windows/GDIFont.cpp
+++ b/legacy/project/src/windows/GDIFont.cpp
@@ -101,7 +101,6 @@ public:
ioMetrics.ascent = std::max( ioMetrics.ascent, (float)mMetrics.tmAscent);
ioMetrics.descent = std::max( ioMetrics.descent, (float)mMetrics.tmDescent);
ioMetrics.height = std::max( ioMetrics.height, (float)mMetrics.tmHeight);
- //ioMetrics.height = std::max( ioMetrics.height, (float)mPixelHeight);
}
int Height()
diff --git a/legacy/project/src/windows/System.cpp b/legacy/project/src/windows/System.cpp
index c9ac16058..de1564f75 100644
--- a/legacy/project/src/windows/System.cpp
+++ b/legacy/project/src/windows/System.cpp
@@ -17,6 +17,13 @@ namespace nme {
std::string CapabilitiesGetLanguage()
{
char locale[8];
+ #ifdef __MINGW32__
+ typedef WINBASEAPI LANGID WINAPI (*GetSystemDefaultUILanguageFunc)();
+ GetSystemDefaultUILanguageFunc GetSystemDefaultUILanguage =
+ (GetSystemDefaultUILanguageFunc)GetProcAddress( LoadLibraryA("kernel32.dll"), "GetSystemDefaultUILanguage");
+ if (!GetSystemDefaultUILanguage)
+ return "en";
+ #endif
int lang_len = GetLocaleInfo(GetSystemDefaultUILanguage(), LOCALE_SISO639LANGNAME, locale, sizeof(locale));
return std::string(locale, lang_len);
}