some refactoring

hopefully improved rendering speed
added support to add .obj obstacles
This commit is contained in:
2018-02-17 17:39:18 +01:00
parent 839401edb7
commit 52ab71fac5
25 changed files with 538 additions and 12 deletions

View File

@@ -39,8 +39,10 @@ private:
Material(128,128,128,255), // concrete
Material(200,200,255,96), // glass
Material(170,120,60,255), // wood
Material(200,200,200,255), // drywall
Material(200,200,200,255), // default
Material(250,250,250,255), // default
};
@@ -56,8 +58,10 @@ private:
if (o.mat == Floorplan::Material::CONCRETE) {return 6;}
if (o.mat == Floorplan::Material::GLASS) {return 7;}
if (o.mat == Floorplan::Material::WOOD) {return 8;}
if (o.mat == Floorplan::Material::DRYWALL) {return 9;}
return 8;
return 10;
}