Skip to content
Snippets Groups Projects
Commit fc102650 authored by Ricardo Ortiz's avatar Ricardo Ortiz
Browse files

Remove Geometry dependency on Rendering

parent 920672ef
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,6 @@ target_link_libraries(Geometry
PRIVATE
Core
Mesh
Rendering
IO
)
......
......@@ -22,7 +22,6 @@
//---------------------------------------------------------------------------
#include "Geometry/MeshModel.h"
#include "Rendering/TextureManager.h"
#include "IO/IOMesh.h"
#include "Core/RenderDelegate.h"
......@@ -78,11 +77,17 @@ void MeshModel::addTexture(const std::string& textureFileName, const std::string
std::cerr << "Cant assign texture to non-surface mesh." << std::endl;
return;
}
//Initialize the texture manager
TextureManager::init();
//Load in the texture for the model
TextureManager::addTexture(textureFileName, textureName);
if(surfaceMesh->getRenderDetail())
{
surfaceMesh->getRenderDetail()->setTextureFilename(textureFileName);
}
else
{
auto renderDetail = std::make_shared<RenderDetail>();
renderDetail->setTextureFilename(textureFileName);
surfaceMesh->setRenderDetail(renderDetail);
}
surfaceMesh->assignTexture(textureName);
}
......@@ -148,7 +148,7 @@ void VegaVolumetricMesh::updateAttachedMeshes(double *q)
{
vertices[i] = restPositions[i] + displacements[i];
}
renderingMesh->computeTriangleNormals();
// renderingMesh->computeTriangleNormals();
renderingMesh->getRenderDelegate()->modified();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment