godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change World to use a base group instead of storing all the world object.

Browse Source 
Makes the code simpler and avoid some potential issues. Add to change a bit some test to make them pass properly.
This commit is contained in:
Godzil
2020-03-09 13:47:42 +00:00
parent 1510de3b36
commit e653855556
4 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/world.cpp
View File

@@ -22,16 +22,12 @@ extern "C" {
#define MIN_ALLOC (2)
World::World() : objectCount(0), lightCount(0)
World::World() : lightCount(0)
{
this->allocatedLightCount = MIN_ALLOC;
this->lightList = (Light **)calloc(sizeof(Light *), MIN_ALLOC);
this->lightCount = 0;
this->allocatedObjectCount = MIN_ALLOC;
this->objectList = (Shape **)calloc(sizeof(Shape *), MIN_ALLOC);
this->objectCount = 0;
#ifdef ENABLE_LUA_SUPPORT
this->L = luaL_newstate(); /* opens Lua */
luaL_openlibs(L); /* opens the basic library */
@@ -45,12 +41,10 @@ World::~World()
void World::addObject(Shape *s)
{
if ((this->objectCount + 1) > this->allocatedObjectCount)
{
this->allocatedObjectCount *= 2;
this->objectList = (Shape **)realloc(this->objectList, sizeof(Shape **) * this->allocatedObjectCount);
}
this->objectList[this->objectCount++] = s;
/* Cheaty but need to be done for now */
s->materialSet = true;
this->worldGroup.addObject(s);
}
void World::addLight(Light *l)
@@ -78,33 +72,12 @@ bool World::lightIsIn(Light &l)
bool World::objectIsIn(Shape &s)
{
int i;
for(i = 0; i < this->objectCount; i++)
{
if (*this->objectList[i] == s)
{
return true;
}
}
return false;
return this->worldGroup.includes(&s);
}
Intersect World::intersect(Ray r)
{
Intersect ret;
int i, j;
for(i = 0; i < this->objectCount; i++)
{
Intersect xs = this->objectList[i]->intersect(r);
for(j = 0; j < xs.count(); j++)
{
ret.add(xs[j]);
}
}
return ret;
return this->worldGroup.intersect(r);
}
Tuple World::shadeHit(Computation comps, uint32_t depthCount)
@@ -230,12 +203,7 @@ void World::dumpMe(FILE *fp)
fprintf(fp, "},\n");
fprintf(fp, "\"Objects\": {\n");
for(i = 0; i < this->objectCount; i++)
{
fprintf(fp, "\"%d\": {\n", i);
this->objectList[i]->dumpMe(fp);
fprintf(fp, "},\n");
}
this->worldGroup.dumpMe(fp);
fprintf(fp, "},\n");
/* JSON Closing */