Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ruiliang Gao
iMSTK
Commits
fc102650
Commit
fc102650
authored
9 years ago
by
Ricardo Ortiz
Browse files
Options
Downloads
Patches
Plain Diff
Remove Geometry dependency on Rendering
parent
920672ef
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Geometry/CMakeLists.txt
+0
-1
0 additions, 1 deletion
Geometry/CMakeLists.txt
Geometry/MeshModel.cpp
+10
-5
10 additions, 5 deletions
Geometry/MeshModel.cpp
Mesh/VegaVolumetricMesh.cpp
+1
-1
1 addition, 1 deletion
Mesh/VegaVolumetricMesh.cpp
with
11 additions
and
7 deletions
Geometry/CMakeLists.txt
+
0
−
1
View file @
fc102650
...
...
@@ -12,7 +12,6 @@ target_link_libraries(Geometry
PRIVATE
Core
Mesh
Rendering
IO
)
...
...
This diff is collapsed.
Click to expand it.
Geometry/MeshModel.cpp
+
10
−
5
View file @
fc102650
...
...
@@ -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
);
}
This diff is collapsed.
Click to expand it.
Mesh/VegaVolumetricMesh.cpp
+
1
−
1
View file @
fc102650
...
...
@@ -148,7 +148,7 @@ void VegaVolumetricMesh::updateAttachedMeshes(double *q)
{
vertices
[
i
]
=
restPositions
[
i
]
+
displacements
[
i
];
}
renderingMesh
->
computeTriangleNormals
();
//
renderingMesh->computeTriangleNormals();
renderingMesh
->
getRenderDelegate
()
->
modified
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment