bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Implement SPSTART/SPSTOP

Browse Source
This commit is contained in:
otya128
2017-07-10 19:33:48 +09:00
parent c5ce4cfde4
commit fb1ca9bc0a
2 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SMILEBASIC/builtinfunctions.d
View File

@@ -2256,6 +2256,40 @@ class BuiltinFunction
throw new IllegalFunctionCall("SPFUNC"/*, 2*/); throw new IllegalFunctionCall("SPFUNC"/*, 2*/);
p.sprite.spfunc(id, callback); p.sprite.spfunc(id, callback);
} }
static void SPSTART(PetitComputer p, int id)
{
if (!p.sprite.isValidSpriteId(id))
{
throw new OutOfRange("SPSTART", 1);
}
if (!p.sprite.isSpriteDefined(id))
{
throw new IllegalFunctionCall("SPSTART", 1);
}
p.sprite.spstart(id);
}
static void SPSTART(PetitComputer p)
{
p.sprite.spstart();
}
static void SPSTOP(PetitComputer p, int id)
{
if (!p.sprite.isValidSpriteId(id))
{
throw new OutOfRange("SPSTOP", 1);
}
if (!p.sprite.isSpriteDefined(id))
{
throw new IllegalFunctionCall("SPSTOP", 1);
}
p.sprite.spstop(id);
}
static void SPSTOP(PetitComputer p)
{
p.sprite.spstop();
}
static void BGMSTOP(PetitComputer p) static void BGMSTOP(PetitComputer p)
{ {
writeln("NOTIMPL:BGMSTOP"); writeln("NOTIMPL:BGMSTOP");

190
SMILEBASIC/sprite.d
View File

@@ -255,6 +255,7 @@ struct SpriteData
this.defno = defno; this.defno = defno;
col = SpriteCollision(&this); col = SpriteCollision(&this);
} }
bool animationEnabled = true;
SpriteAnimData[][SpriteAnimTarget.V + 1] anim; SpriteAnimData[][SpriteAnimTarget.V + 1] anim;
int[SpriteAnimTarget.V + 1] animindex; int[SpriteAnimTarget.V + 1] animindex;
int[SpriteAnimTarget.V + 1] animloop; int[SpriteAnimTarget.V + 1] animloop;
@@ -396,43 +397,48 @@ class Sprite
} }
void animation(SpriteData* sprite, SpriteAnimData* data, SpriteAnimTarget target) void animation(SpriteData* sprite, SpriteAnimData* data, SpriteAnimTarget target)
{ {
if(!data.interpolation) if (!sprite.animationEnabled)
return;
auto frame = data.elapse;
if(frame == 1)
{ {
switch(target) if(!data.interpolation)
{ {
case SpriteAnimTarget.XY: switch(target)
sprite.x = cast(int)data.data.x; {
sprite.y = cast(int)data.data.y; case SpriteAnimTarget.XY:
break; sprite.x = cast(int)data.data.x;
case SpriteAnimTarget.Z: sprite.y = cast(int)data.data.y;
sprite.z = cast(int)data.data.z; break;
break; case SpriteAnimTarget.Z:
case SpriteAnimTarget.UV: sprite.z = cast(int)data.data.z;
sprite.u = data.data.u; break;
sprite.v = data.data.v; case SpriteAnimTarget.UV:
break; sprite.u = data.data.u;
case SpriteAnimTarget.I: sprite.v = data.data.v;
sprite.defno = data.data.i; break;
spchr(sprite.id, sprite.defno); case SpriteAnimTarget.I:
break; sprite.defno = data.data.i;
case SpriteAnimTarget.R: spchr(sprite.id, sprite.defno);
sprite.r = data.data.r; break;
break; case SpriteAnimTarget.R:
case SpriteAnimTarget.S: sprite.r = data.data.r;
sprite.scalex = data.data.scalex; break;
sprite.scaley = data.data.scaley; case SpriteAnimTarget.S:
break; sprite.scalex = data.data.scalex;
case SpriteAnimTarget.C: sprite.scaley = data.data.scaley;
break; break;
case SpriteAnimTarget.V: case SpriteAnimTarget.C:
break; break;
default: case SpriteAnimTarget.V:
break; break;
default:
break;
}
} }
} }
else if(data.interpolation)
{ {
auto frame = data.elapse;
//線形補完する奴 //線形補完する奴
switch(target) switch(target)
{ {
@@ -444,11 +450,11 @@ class Sprite
sprite.z = cast(int)(data.old.z + ((data.data.z - data.old.z) / data.frame) * frame); sprite.z = cast(int)(data.old.z + ((data.data.z - data.old.z) / data.frame) * frame);
break; break;
case SpriteAnimTarget.UV: case SpriteAnimTarget.UV:
sprite.u = data.old.u + ((data.data.u - data.old.u) / data.frame) * frame; sprite.u = data.old.u + cast(int)(((data.data.u - data.old.u) / cast(double)data.frame) * frame);
sprite.v = data.old.v + ((data.data.v - data.old.v) / data.frame) * frame; sprite.v = data.old.v + cast(int)(((data.data.v - data.old.v) / cast(double)data.frame) * frame);
break; break;
case SpriteAnimTarget.I: case SpriteAnimTarget.I:
sprite.defno = data.old.i + ((data.data.i - data.old.i) / data.frame) * frame; sprite.defno = data.old.i + cast(int)(((data.data.i - data.old.i) / cast(double)data.frame) * frame);
spchr(sprite.id, sprite.defno); spchr(sprite.id, sprite.defno);
break; break;
case SpriteAnimTarget.R: case SpriteAnimTarget.R:
@@ -469,6 +475,8 @@ class Sprite
} }
void animation(SpriteData* sprite) void animation(SpriteData* sprite)
{ {
if (!sprite.animationEnabled)
return;
foreach(i, ref d; sprite.anim) foreach(i, ref d; sprite.anim)
{ {
if(!d) continue;//未定義 if(!d) continue;//未定義
@@ -477,78 +485,7 @@ class Sprite
SpriteAnimData* data = &d[index]; SpriteAnimData* data = &d[index];
data.elapse = data.elapse + 1; data.elapse = data.elapse + 1;
auto frame = data.elapse; auto frame = data.elapse;
if(frame == 1) animation(sprite, data, target);
{
if(!data.interpolation)
{
switch(target)
{
case SpriteAnimTarget.XY:
sprite.x = data.data.x;
sprite.y = data.data.y;
break;
case SpriteAnimTarget.Z:
sprite.z = cast(int)data.data.z;
break;
case SpriteAnimTarget.UV:
sprite.u = data.data.u;
sprite.v = data.data.v;
break;
case SpriteAnimTarget.I:
sprite.defno = data.data.i;
spchr(sprite.id, sprite.defno);
break;
case SpriteAnimTarget.R:
sprite.r = data.data.r;
break;
case SpriteAnimTarget.S:
sprite.scalex = data.data.scalex;
sprite.scaley = data.data.scaley;
break;
case SpriteAnimTarget.C:
break;
case SpriteAnimTarget.V:
break;
default:
break;
}
}
}
if(data.interpolation)
{
//線形補完する奴
switch(target)
{
case SpriteAnimTarget.XY:
sprite.x = data.old.x + ((data.data.x - data.old.x) / data.frame) * frame;
sprite.y = data.old.y + ((data.data.y - data.old.y) / data.frame) * frame;
break;
case SpriteAnimTarget.Z:
sprite.z = cast(int)(data.old.z + ((data.data.z - data.old.z) / data.frame) * frame);
break;
case SpriteAnimTarget.UV:
sprite.u = data.old.u + cast(int)(((data.data.u - data.old.u) / cast(double)data.frame) * frame);
sprite.v = data.old.v + cast(int)(((data.data.v - data.old.v) / cast(double)data.frame) * frame);
break;
case SpriteAnimTarget.I:
sprite.defno = data.old.i + cast(int)(((data.data.i - data.old.i) / cast(double)data.frame) * frame);
spchr(sprite.id, sprite.defno);
break;
case SpriteAnimTarget.R:
sprite.r = data.old.r + ((data.data.r - data.old.r) / data.frame) * frame;
break;
case SpriteAnimTarget.S:
sprite.scalex = data.old.scalex + ((data.data.scalex - data.old.scalex) / data.frame) * frame;
sprite.scaley = data.old.scaley + ((data.data.scaley - data.old.scaley) / data.frame) * frame;
break;
case SpriteAnimTarget.C:
break;
case SpriteAnimTarget.V:
break;
default:
break;
}
}
if(frame >= data.frame) if(frame >= data.frame)
{ {
sprite.animindex[i] = (sprite.animindex[i] + 1) % cast(int)d.length; sprite.animindex[i] = (sprite.animindex[i] + 1) % cast(int)d.length;
@@ -1255,4 +1192,43 @@ class Sprite
{ {
return sprites[spid(id)].callback; return sprites[spid(id)].callback;
} }
void spstart(int id)
{
setSpriteAnimationEnabled(id, true);
}
void spstart()
{
setSpriteAnimationEnabled(true);
}
void spstop(int id)
{
setSpriteAnimationEnabled(id, false);
}
void spstop()
{
setSpriteAnimationEnabled(false);
}
void setSpriteAnimationEnabled(int id, bool flag)
{
id = spid(id);
sprites[id].animationEnabled = flag;
}
void setSpriteAnimationEnabled(bool flag)
{
auto id = spid(0);
if(spmax <= id)
{
synchronized (this) for(int i = id; i < sprites.length; i++)
{
sprites[i].animationEnabled = flag;
}
}
else
{
synchronized (this) for(int i = 0; i < spmax; i++)
{
sprites[i].animationEnabled = flag;
}
}
}
} }