Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

iMSTK
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

0ed65feb

Commit 0ed65feb authored 7 years ago by Sreekanth Arikatla

Downloads
- Plain Diff

Merge branch 'normalUVSeam' into 'master'

Normal seam improvement and color fixes

See merge request !203

parents d5362cbf f1893282

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Base/Geometry/Mesh/imstkSurfaceMesh.cpp 67 additions, 7 deletions

Base/Geometry/Mesh/imstkSurfaceMesh.cpp
Base/Geometry/Mesh/imstkSurfaceMesh.h 58 additions, 1 deletion

Base/Geometry/Mesh/imstkSurfaceMesh.h
Base/Geometry/Reader/imstkAssimpMeshIO.cpp 4 additions, 3 deletions

Base/Geometry/Reader/imstkAssimpMeshIO.cpp
Base/Materials/imstkRenderMaterial.cpp 13 additions, 0 deletions

Base/Materials/imstkRenderMaterial.cpp
Base/Materials/imstkRenderMaterial.h 7 additions, 0 deletions

Base/Materials/imstkRenderMaterial.h
Base/Materials/imstkTexture.h 2 additions, 2 deletions

Base/Materials/imstkTexture.h
Base/Rendering/RenderDelegate/imstkVTKRenderDelegate.cpp 6 additions, 7 deletions

Base/Rendering/RenderDelegate/imstkVTKRenderDelegate.cpp
Base/Rendering/RenderDelegate/imstkVTKRenderDelegate.h 4 additions, 1 deletion

Base/Rendering/RenderDelegate/imstkVTKRenderDelegate.h
Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp 21 additions, 2 deletions

...ring/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp
Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h 1 addition, 0 deletions

...dering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h
Base/Rendering/VTKShaders/mesh.frag 6 additions, 1 deletion

Base/Rendering/VTKShaders/mesh.frag
Base/Rendering/imstkVTKCustomPolyDataMapper.cpp 17 additions, 4 deletions

Base/Rendering/imstkVTKCustomPolyDataMapper.cpp

with 206 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment