Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/OpenGLCompositor.cpp @ 841:266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
in WebAssemblyOracle + support for LookupTableTextureSceneLayer in OpenGL (NOT
using shaders!) (2 new files) + a few small non-functional changes
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Tue, 11 Jun 2019 15:41:21 +0200 |
parents | 7efa2543699d |
children | 80829436ce0c 77c96ba899f9 |
comparison
equal
deleted
inserted
replaced
840:47fc7919977d | 841:266e2b0b9abc |
---|---|
24 #include "Internals/OpenGLAdvancedPolylineRenderer.h" | 24 #include "Internals/OpenGLAdvancedPolylineRenderer.h" |
25 #include "Internals/OpenGLBasicPolylineRenderer.h" | 25 #include "Internals/OpenGLBasicPolylineRenderer.h" |
26 #include "Internals/OpenGLColorTextureRenderer.h" | 26 #include "Internals/OpenGLColorTextureRenderer.h" |
27 #include "Internals/OpenGLFloatTextureRenderer.h" | 27 #include "Internals/OpenGLFloatTextureRenderer.h" |
28 #include "Internals/OpenGLInfoPanelRenderer.h" | 28 #include "Internals/OpenGLInfoPanelRenderer.h" |
29 #include "Internals/OpenGLLookupTableTextureRenderer.h" | |
29 #include "Internals/OpenGLTextRenderer.h" | 30 #include "Internals/OpenGLTextRenderer.h" |
30 | 31 |
31 namespace OrthancStone | 32 namespace OrthancStone |
32 { | 33 { |
33 class OpenGLCompositor::Font : public boost::noncopyable | 34 class OpenGLCompositor::Font : public boost::noncopyable |
89 (context_, colorTextureProgram_, dynamic_cast<const ColorTextureSceneLayer&>(layer)); | 90 (context_, colorTextureProgram_, dynamic_cast<const ColorTextureSceneLayer&>(layer)); |
90 | 91 |
91 case ISceneLayer::Type_FloatTexture: | 92 case ISceneLayer::Type_FloatTexture: |
92 return new Internals::OpenGLFloatTextureRenderer | 93 return new Internals::OpenGLFloatTextureRenderer |
93 (context_, floatTextureProgram_, dynamic_cast<const FloatTextureSceneLayer&>(layer)); | 94 (context_, floatTextureProgram_, dynamic_cast<const FloatTextureSceneLayer&>(layer)); |
95 | |
96 case ISceneLayer::Type_LookupTableTexture: | |
97 return new Internals::OpenGLLookupTableTextureRenderer | |
98 (context_, colorTextureProgram_, dynamic_cast<const LookupTableTextureSceneLayer&>(layer)); | |
94 | 99 |
95 case ISceneLayer::Type_Polyline: | 100 case ISceneLayer::Type_Polyline: |
96 return new Internals::OpenGLAdvancedPolylineRenderer | 101 return new Internals::OpenGLAdvancedPolylineRenderer |
97 (context_, linesProgram_, dynamic_cast<const PolylineSceneLayer&>(layer)); | 102 (context_, linesProgram_, dynamic_cast<const PolylineSceneLayer&>(layer)); |
98 //return new Internals::OpenGLBasicPolylineRenderer(context_, dynamic_cast<const PolylineSceneLayer&>(layer)); | 103 //return new Internals::OpenGLBasicPolylineRenderer(context_, dynamic_cast<const PolylineSceneLayer&>(layer)); |