Merge branch 'master' of github.com:aap/librw

This commit is contained in:
aap
2016-06-16 14:12:51 +02:00
4 changed files with 26 additions and 16 deletions

View File

@@ -607,6 +607,15 @@ Atomic::destroy(void)
free(this);
}
void
Atomic::removeFromClump(void)
{
if(this->clump){
this->inClump.remove();
this->clump = NULL;
}
}
Sphere*
Atomic::getWorldBoundingSphere(void)
{

View File

@@ -437,11 +437,12 @@ struct Atomic : PluginBase<Atomic>
Frame *getFrame(void) { return (Frame*)this->object.object.parent; }
static Atomic *fromClump(LLLink *lnk){
return LLLinkGetData(lnk, Atomic, inClump); }
ObjPipeline *getPipeline(void);
void removeFromClump(void);
Sphere *getWorldBoundingSphere(void);
ObjPipeline *getPipeline(void);
void render(void) { this->renderCB(this); }
static Atomic *streamReadClump(Stream *stream,
Frame **frameList, Geometry **geometryList);
void render(void) { this->renderCB(this); }
bool streamWriteClump(Stream *stream,
Frame **frameList, int32 numframes);
uint32 streamGetSize(void);