bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix SPANIM

Browse Source
This commit is contained in:
otya128
2016-12-23 15:05:48 +09:00
parent 78a9d27098
commit 4ca392b40b
1 changed files with 72 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
SMILEBASIC/sprite.d
View File

@@ -265,6 +265,7 @@ struct SpriteData
} }
animloop[sat] = loop; animloop[sat] = loop;
animloopcnt[sat] = 0; animloopcnt[sat] = 0;
animindex[sat] = 0;
this.anim[sat] = anim; this.anim[sat] = anim;
isAnim = true; isAnim = true;
} }
@@ -589,7 +590,7 @@ class Sprite
{ {
if ((!visibles[0] && !visibles[1]) || (petitcom.xscreenmode == 2 && !visibles[0])) if ((!visibles[0] && !visibles[1]) || (petitcom.xscreenmode == 2 && !visibles[0]))
{ {
foreach(ref sprite; sprites) synchronized (this) foreach(ref sprite; sprites)
{ {
if(sprite.define) if(sprite.define)
{ {
@@ -680,7 +681,7 @@ class Sprite
// glDisable(GL_TEXTURE_2D); // glDisable(GL_TEXTURE_2D);
version(test) glLoadIdentity(); version(test) glLoadIdentity();
glLoadIdentity(); glLoadIdentity();
foreach(i, sprite; zsortedSprites) synchronized (this) foreach(i, sprite; zsortedSprites)
{ {
//定義されてたら動かす //定義されてたら動かす
if(sprite.define) if(sprite.define)
@@ -858,13 +859,15 @@ class Sprite
void spset(int id, int defno) void spset(int id, int defno)
{ {
id = spid(id); id = spid(id);
sprites[id] = SpriteData(id, SPDEFTable[defno], defno); synchronized (this)
sprites[id] = SpriteData(id, SPDEFTable[defno], defno);
} }
void spset(int id, int u, int v, int w, int h, SpriteAttr attr) void spset(int id, int u, int v, int w, int h, SpriteAttr attr)
{ {
id = spid(id); id = spid(id);
auto spdef = SpriteDef(u, v, w, h, 0, 0, attr); auto spdef = SpriteDef(u, v, w, h, 0, 0, attr);
sprites[id] = SpriteData(id, spdef, 0/*要調査*/); synchronized (this)
sprites[id] = SpriteData(id, spdef, 0/*要調査*/);
} }
int spchk(int id) int spchk(int id)
{ {
@@ -883,21 +886,27 @@ class Sprite
{ {
//animeとめる //animeとめる
id = spid(id); id = spid(id);
sprites[id].anim[SpriteAnimTarget.XY] = null; synchronized (this)
sprites[id].x = x; {
sprites[id].y = y; sprites[id].anim[SpriteAnimTarget.XY] = null;
sprites[id].linkx = cast(int)(x + (sprites[id].parent ? sprites[id].parent.linkx : 0)); sprites[id].x = x;
sprites[id].linky = cast(int)(y + (sprites[id].parent ? sprites[id].parent.linky : 0)); sprites[id].y = y;
sprites[id].linkx = cast(int)(x + (sprites[id].parent ? sprites[id].parent.linkx : 0));
sprites[id].linky = cast(int)(y + (sprites[id].parent ? sprites[id].parent.linky : 0));
}
} }
void spofs(int id, double x, double y, int z) void spofs(int id, double x, double y, int z)
{ {
id = spid(id); id = spid(id);
sprites[id].anim[SpriteAnimTarget.XY] = null; synchronized (this)
sprites[id].x = x; {
sprites[id].y = y; sprites[id].anim[SpriteAnimTarget.XY] = null;
sprites[id].z = z; sprites[id].x = x;
sprites[id].linkx = cast(int)(x + (sprites[id].parent ? sprites[id].parent.linkx : 0)); sprites[id].y = y;
sprites[id].linky = cast(int)(y + (sprites[id].parent ? sprites[id].parent.linky : 0)); sprites[id].z = z;
sprites[id].linkx = cast(int)(x + (sprites[id].parent ? sprites[id].parent.linkx : 0));
sprites[id].linky = cast(int)(y + (sprites[id].parent ? sprites[id].parent.linky : 0));
}
zChange = true; zChange = true;
} }
void getspofs(int id, out double x, out double y, out int z) void getspofs(int id, out double x, out double y, out int z)
@@ -958,44 +967,47 @@ class Sprite
} }
void spanim(int id, SpriteAnimTarget target, double[] data) void spanim(int id, SpriteAnimTarget target, double[] data)
{ {
id = spid(id); synchronized (this)
bool relative;
if(SpriteAnimTarget.relative & target)
{ {
relative = true; id = spid(id);
target ^= SpriteAnimTarget.relative; bool relative;
} if(SpriteAnimTarget.relative & target)
int animcount = cast(int)data.length / ((target == SpriteAnimTarget.XY || target == SpriteAnimTarget.UV) ? 3 : 2);
SpriteAnimData[] animdata = new SpriteAnimData[animcount];
int j;
int loop = 1;
SpriteAnimData* old;
for(int i = 0; i < data.length;)
{
i = animdata[j].load(i, sprites[id], target, data, old);
old = &animdata[j++];
if(data.length - i == 1)
{ {
//loop relative = true;
loop = cast(int)data[i]; target ^= SpriteAnimTarget.relative;
break;
} }
} int animcount = cast(int)data.length / ((target == SpriteAnimTarget.XY || target == SpriteAnimTarget.UV) ? 3 : 2);
sprites[id].setAnimation(animdata, target, loop); SpriteAnimData[] animdata = new SpriteAnimData[animcount];
if(animdata[0].frame == 1) int j;
{ int loop = 1;
sprites[id].animindex[target]++; SpriteAnimData* old;
animation(&sprites[id], &animdata[0], target); for(int i = 0; i < data.length;)
if(animcount == 1)
{ {
if(loop > 1 || loop == 0) i = animdata[j].load(i, sprites[id], target, data, old);
old = &animdata[j++];
if(data.length - i == 1)
{ {
sprites[id].animindex[target] = 0; //loop
sprites[id].animloopcnt[target]++; loop = cast(int)data[i];
break;
} }
else }
sprites[id].setAnimation(animdata, target, loop);
if(animdata[0].frame == 1)
{
sprites[id].animindex[target]++;
animation(&sprites[id], &animdata[0], target);
if(animcount == 1)
{ {
sprites[id].anim[target] = null; if(loop > 1 || loop == 0)
{
sprites[id].animindex[target] = 0;
sprites[id].animloopcnt[target]++;
}
else
{
sprites[id].anim[target] = null;
}
} }
} }
} }
@@ -1003,11 +1015,12 @@ class Sprite
void spclr(int id) void spclr(int id)
{ {
id = spid(id); id = spid(id);
sprites[id].clear; synchronized (this)
sprites[id].clear;
} }
void spclr() void spclr()
{ {
for(int i = 0; i < sprites.length; i++) synchronized (this) for(int i = 0; i < sprites.length; i++)
{ {
sprites[i].clear; sprites[i].clear;
} }
@@ -1015,14 +1028,20 @@ class Sprite
void sphome(int i, int hx, int hy) void sphome(int i, int hx, int hy)
{ {
i = spid(i); i = spid(i);
sprites[i].homex = hx; synchronized (this)
sprites[i].homey = hy; {
sprites[i].homex = hx;
sprites[i].homey = hy;
}
} }
void spscale(int i, double x, double y) void spscale(int i, double x, double y)
{ {
i = spid(i); i = spid(i);
sprites[i].scalex = x; synchronized (this)
sprites[i].scaley = y; {
sprites[i].scalex = x;
sprites[i].scaley = y;
}
} }
void sprot(int i, double rot) void sprot(int i, double rot)
{ {
@@ -1067,7 +1086,7 @@ class Sprite
void spcol(int id, bool scale, int mask) void spcol(int id, bool scale, int mask)
{ {
id = spid(id); id = spid(id);
spcol(id, 0, 0, cast(ushort)sprites[id].w, cast(ushort)sprites[id].h, scale, mask); synchronized (this) spcol(id, 0, 0, cast(ushort)sprites[id].w, cast(ushort)sprites[id].h, scale, mask);
} }
void spcol(int id, short sx, short sy, ushort w, ushort h, bool scale, int mask) void spcol(int id, short sx, short sy, ushort w, ushort h, bool scale, int mask)
{ {