test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-06 14:17:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

AnimatedRotateDrawable support negative increment and gfx load logo data file

Browse Source
This commit is contained in:
unknown 2023-11-19 14:09:01 +08:00
parent 398ef50e0d
commit d84de8e99e
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/drawables/animatedrotatedrawable.cc
View File

@ -44,8 +44,14 @@ AnimatedRotateDrawable::AnimatedRotateDrawable(std::shared_ptr<AnimatedRotateSta
updateLocalState();
mNextFrame = [this](){
mCurrentDegrees += mIncrement;
if (mCurrentDegrees > (360.0f - mIncrement)) {
mCurrentDegrees = 0.0f;
if (mIncrement < 0) {
if (mCurrentDegrees < -1 * (360.0f + mIncrement)) {
mCurrentDegrees = 0.0f;
}
} else {
if (mCurrentDegrees > (360.0f - mIncrement)) {
mCurrentDegrees = 0.0f;
}
}
invalidateSelf();
nextFrame();
@ -165,7 +171,7 @@ void AnimatedRotateDrawable::draw(Canvas& canvas) {
float px = bounds.left+(mState->mPivotXRel ? (w * mState->mPivotX) : mState->mPivotX);
float py = bounds.top+(mState->mPivotYRel ? (h * mState->mPivotY) : mState->mPivotY);
LOGV("%p bounds(%d,%d %d,%d) pivot=%f,%f pxy=%f,%f degrees=%f",this,bounds.left,bounds.top,bounds.width,bounds.height,
LOGV("%p bounds(%d,%d %d,%d) pivot=%f,%f pxy=%f,%f degrees=%f",this,bounds.left,bounds.top,bounds.width,bounds.height,
mState->mPivotX, mState->mPivotY,px,py,mCurrentDegrees);
const float radians=M_PI*2.f*mCurrentDegrees/360.f;
@ -199,7 +205,6 @@ Drawable*AnimatedRotateDrawable::inflate(Context*ctx,const AttributeSet&atts){
Drawable*child = createWrappedDrawable(ctx,atts);
ad->setDrawable(child);
return ad;
}
}
}
}

16
src/porting/sigma/graph_gfx.c
View File

@ -115,6 +115,18 @@ int GFXInit() {
for(int i =0;i<index;i++){
MI_PHY phySrcBufAddr = devSurfaces[i].kbuffer;
MI_SYS_Mmap(phySrcBufAddr,devSurfaces[i].msize, (void**)&devSurfaces[i].buffer, FALSE);
if (i == 0 && access("logo.dat", F_OK) == 0) {
size_t rlen, tlen = 0;
char *buf = devSurfaces[i].buffer;
size_t blen = devSurfaces[i].msize;
FILE *fo = fopen("logo.dat", "rb");
#define __tmin__(a,b) ((a)>(b)?(b):(a))
while (tlen < blen && (rlen = fread(buf + tlen, 1, __tmin__(blen - tlen, 4096), fo)) > 0) {
tlen += rlen;
}
fclose(fo);
LOGI("Logo buf=%p blen=%u tlen=%u", buf, blen, tlen);
}
LOGI("Surface[%d]buffer=%llx/%p %d",i,phySrcBufAddr,devSurfaces[i].buffer,devSurfaces[i].msize);
}
LOGI("%d surfaces is configured for app usage",index);
@ -302,12 +314,12 @@ INT GFXCreateSurface(int dispid,HANDLE*surface,UINT width,UINT height,INT format
memset(surf->buffer,0,surf->msize);
}
}
if(surf->kbuffer)MI_SYS_MemsetPa(surf->kbuffer,0x000000,surf->msize);
if(surf->kbuffer && !hwsurface) MI_SYS_MemsetPa(surf->kbuffer,0x000000,surf->msize);
surf->orig_buffer=surf->buffer;
if(hwsurface) setfbinfo(surf);
surf->ishw=hwsurface;
surf->alpha=255;
LOGI("Surface=%p buf=%llx/%p size=%dx%d/%d hw=%d\r\n",surf,surf->kbuffer,surf->buffer,surf->width,surf->height,surf->msize,hwsurface);
LOGI("Surface=%p buf=%llx/%p size=%dx%d/%d hw=%d",surf,surf->kbuffer,surf->buffer,surf->width,surf->height,surf->msize,hwsurface);
*surface=surf;
return E_OK;
}