Update Ghoul repository to have the factory return unique_ptrs

Adjust accordingly
This commit is contained in:
Alexander Bock
2017-03-01 22:03:48 -05:00
parent 2b07cf8c05
commit 2f2fa3b031
26 changed files with 69 additions and 52 deletions

View File

@@ -85,7 +85,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
if (success)
_colorTexturePath = absPath(texturePath);
addPropertySubOwner(_geometry);
addPropertySubOwner(_geometry.get());
addProperty(_colorTexturePath);
_colorTexturePath.onChange(std::bind(&RenderableModel::loadTexture, this));
@@ -153,7 +153,6 @@ bool RenderableModel::initialize() {
bool RenderableModel::deinitialize() {
if (_geometry) {
_geometry->deinitialize();
delete _geometry;
_geometry = nullptr;
}
_texture = nullptr;