16.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 533d5618 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Changed all occurences of tgt in code to cgt.

refs #386
parent 760e01f1
...@@ -17,7 +17,7 @@ OPTION(CAMPVIS_BUILD_APPLICATION "Build CAMPVis Application" ...@@ -17,7 +17,7 @@ OPTION(CAMPVIS_BUILD_APPLICATION "Build CAMPVis Application"
OPTION(CAMPVIS_BUILD_CORE "Build CAMPVis Core" ON) OPTION(CAMPVIS_BUILD_CORE "Build CAMPVis Core" ON)
OPTION(CAMPVIS_BUILD_MODULES "Build CAMPVis Modules" ON) OPTION(CAMPVIS_BUILD_MODULES "Build CAMPVis Modules" ON)
OPTION(CAMPVIS_ENABLE_SCRIPTING "Add support for scripting CAMPVis using Lua" OFF) OPTION(CAMPVIS_ENABLE_SCRIPTING "Add support for scripting CAMPVis using Lua" OFF)
OPTION(CAMPVIS_BUILD_LIB_TGT "Build TGT Library" ON) OPTION(CAMPVIS_BUILD_LIB_CGT "Build CGT Library" ON)
OPTION(CAMPVIS_BUILD_LIB_LUA "Build Lua Library" OFF) OPTION(CAMPVIS_BUILD_LIB_LUA "Build Lua Library" OFF)
OPTION(CAMPVIS_BUILD_DOXYGEN "Build Doxygen Documentation" OFF) OPTION(CAMPVIS_BUILD_DOXYGEN "Build Doxygen Documentation" OFF)
...@@ -43,7 +43,7 @@ include(cmake/parseModulesDir.cmake) ...@@ -43,7 +43,7 @@ include(cmake/parseModulesDir.cmake)
MESSAGE(STATUS "--------------------------------------------------------------------------------") MESSAGE(STATUS "--------------------------------------------------------------------------------")
IF(CAMPVIS_BUILD_LIB_TGT) IF(CAMPVIS_BUILD_LIB_CGT)
ADD_SUBDIRECTORY(ext/cgt) ADD_SUBDIRECTORY(ext/cgt)
ADD_SUBDIRECTORY(ext/sigslot) ADD_SUBDIRECTORY(ext/sigslot)
ENDIF() ENDIF()
......
...@@ -97,7 +97,7 @@ LIST(APPEND CampvisApplicationSources ${CampvisApplicationFormsHeaders}) ...@@ -97,7 +97,7 @@ LIST(APPEND CampvisApplicationSources ${CampvisApplicationFormsHeaders})
LINK_DIRECTORIES(${CampvisGlobalLinkDirectories} ${CampvisModulesLinkDirectories}) LINK_DIRECTORIES(${CampvisGlobalLinkDirectories} ${CampvisModulesLinkDirectories})
SET(CampvisMainLibs campvis-core campvis-modules tgt sigslot) SET(CampvisMainLibs campvis-core campvis-modules cgt sigslot)
IF(CAMPVIS_ENABLE_SCRIPTING) IF(CAMPVIS_ENABLE_SCRIPTING)
LIST(APPEND CampvisMainLibs campvis-scripting) LIST(APPEND CampvisMainLibs campvis-scripting)
......
...@@ -75,14 +75,14 @@ namespace campvis { ...@@ -75,14 +75,14 @@ namespace campvis {
sigslot::signal_manager::init(); sigslot::signal_manager::init();
sigslot::signal_manager::getRef().start(); sigslot::signal_manager::getRef().start();
tgt::GlContextManager::init(); cgt::GlContextManager::init();
OpenGLJobProcessor::init(); OpenGLJobProcessor::init();
SimpleJobProcessor::init(); SimpleJobProcessor::init();
QtJobProcessor::init(); QtJobProcessor::init();
} }
CampVisApplication::~CampVisApplication() { CampVisApplication::~CampVisApplication() {
tgtAssert(_initialized == false, "Destructing initialized CampVisApplication, deinitialize first!"); cgtAssert(_initialized == false, "Destructing initialized CampVisApplication, deinitialize first!");
// delete everything in the right order: // delete everything in the right order:
for (std::vector<PipelineRecord>::iterator it = _pipelines.begin(); it != _pipelines.end(); ++it) { for (std::vector<PipelineRecord>::iterator it = _pipelines.begin(); it != _pipelines.end(); ++it) {
...@@ -98,20 +98,20 @@ namespace campvis { ...@@ -98,20 +98,20 @@ namespace campvis {
} }
void CampVisApplication::init() { void CampVisApplication::init() {
tgtAssert(_initialized == false, "Tried to initialize CampVisApplication twice."); cgtAssert(_initialized == false, "Tried to initialize CampVisApplication twice.");
// Init TGT // Init CGT
tgt::InitFeature::Features featureset = tgt::InitFeature::ALL; cgt::InitFeature::Features featureset = cgt::InitFeature::ALL;
tgt::init(featureset); cgt::init(featureset);
LogMgr.getConsoleLog()->addCat("", true); LogMgr.getConsoleLog()->addCat("", true);
_mainWindow = new MainWindow(this); _mainWindow = new MainWindow(this);
// create a local OpenGL context and init GL // create a local OpenGL context and init GL
_localContext = new QtThreadedCanvas("", tgt::ivec2(16, 16)); _localContext = new QtThreadedCanvas("", cgt::ivec2(16, 16));
tgt::GlContextManager::getRef().registerContextAndInitGlew(_localContext, "Local Context"); cgt::GlContextManager::getRef().registerContextAndInitGlew(_localContext, "Local Context");
tgt::initGL(featureset); cgt::initGL(featureset);
ShdrMgr.setDefaultGlslVersion("330"); ShdrMgr.setDefaultGlslVersion("330");
LGL_ERROR; LGL_ERROR;
...@@ -120,11 +120,11 @@ namespace campvis { ...@@ -120,11 +120,11 @@ namespace campvis {
if (_argc > 0) { if (_argc > 0) {
// ugly hack // ugly hack
std::string basePath(_argv[0]); std::string basePath(_argv[0]);
basePath = tgt::FileSystem::parentDir(basePath); basePath = cgt::FileSystem::parentDir(basePath);
ShdrMgr.addPath(basePath); ShdrMgr.addPath(basePath);
ShdrMgr.addPath(basePath + "/core/glsl"); ShdrMgr.addPath(basePath + "/core/glsl");
basePath = tgt::FileSystem::parentDir(tgt::FileSystem::parentDir(basePath)); basePath = cgt::FileSystem::parentDir(cgt::FileSystem::parentDir(basePath));
ShdrMgr.addPath(basePath); ShdrMgr.addPath(basePath);
ShdrMgr.addPath(basePath + "/core/glsl"); ShdrMgr.addPath(basePath + "/core/glsl");
...@@ -142,17 +142,17 @@ namespace campvis { ...@@ -142,17 +142,17 @@ namespace campvis {
// ensure matching OpenGL specs // ensure matching OpenGL specs
LINFO("Using Graphics Hardware " << GpuCaps.getVendorAsString() << " " << GpuCaps.getGlRendererString() << " on " << GpuCaps.getOSVersionString()); LINFO("Using Graphics Hardware " << GpuCaps.getVendorAsString() << " " << GpuCaps.getGlRendererString() << " on " << GpuCaps.getOSVersionString());
LINFO("Supported OpenGL " << GpuCaps.getGlVersion() << ", GLSL " << GpuCaps.getShaderVersion()); LINFO("Supported OpenGL " << GpuCaps.getGlVersion() << ", GLSL " << GpuCaps.getShaderVersion());
if (GpuCaps.getGlVersion() < tgt::GpuCapabilities::GlVersion::TGT_GL_VERSION_3_3) { if (GpuCaps.getGlVersion() < cgt::GpuCapabilities::GlVersion::CGT_GL_VERSION_3_3) {
LERROR("Your system does not support OpenGL 3.3, which is mandatory. CAMPVis will probably not work as intended."); LERROR("Your system does not support OpenGL 3.3, which is mandatory. CAMPVis will probably not work as intended.");
} }
if (GpuCaps.getShaderVersion() < tgt::GpuCapabilities::GlVersion::SHADER_VERSION_330) { if (GpuCaps.getShaderVersion() < cgt::GpuCapabilities::GlVersion::SHADER_VERSION_330) {
LERROR("Your system does not support GLSL Shader Version 3.30, which is mandatory. CAMPVis will probably not work as intended."); LERROR("Your system does not support GLSL Shader Version 3.30, which is mandatory. CAMPVis will probably not work as intended.");
} }
// load textureData from file // load textureData from file
tgt::TextureReaderTga trt; cgt::TextureReaderTga trt;
_errorTexture = trt.loadTexture(ShdrMgr.completePath("application/data/no_input.tga"), tgt::Texture::LINEAR); _errorTexture = trt.loadTexture(ShdrMgr.completePath("application/data/no_input.tga"), cgt::Texture::LINEAR);
#ifdef CAMPVIS_HAS_SCRIPTING #ifdef CAMPVIS_HAS_SCRIPTING
...@@ -167,7 +167,7 @@ namespace campvis { ...@@ -167,7 +167,7 @@ namespace campvis {
// Load CAMPVis' core Lua module to have SWIG glue for AutoEvaluationPipeline available // Load CAMPVis' core Lua module to have SWIG glue for AutoEvaluationPipeline available
if (! _luaVmState->execString("require(\"campvis\")")) if (! _luaVmState->execString("require(\"campvis\")"))
LERROR("Error setting up Lua VM."); LERROR("Error setting up Lua VM.");
if (! _luaVmState->execString("require(\"tgt\")")) if (! _luaVmState->execString("require(\"cgt\")"))
LERROR("Error setting up Lua VM."); LERROR("Error setting up Lua VM.");
if (! _luaVmState->execString("pipelines = {}")) if (! _luaVmState->execString("pipelines = {}"))
...@@ -194,7 +194,7 @@ namespace campvis { ...@@ -194,7 +194,7 @@ namespace campvis {
} }
void CampVisApplication::deinit() { void CampVisApplication::deinit() {
tgtAssert(_initialized, "Tried to deinitialize uninitialized CampVisApplication."); cgtAssert(_initialized, "Tried to deinitialize uninitialized CampVisApplication.");
// Stop all pipeline threads. // Stop all pipeline threads.
for (std::vector<PipelineRecord>::iterator it = _pipelines.begin(); it != _pipelines.end(); ++it) { for (std::vector<PipelineRecord>::iterator it = _pipelines.begin(); it != _pipelines.end(); ++it) {
...@@ -203,7 +203,7 @@ namespace campvis { ...@@ -203,7 +203,7 @@ namespace campvis {
{ {
// Deinit everything OpenGL related using the local context. // Deinit everything OpenGL related using the local context.
tgt::GLContextScopedLock lock(_localContext); cgt::GLContextScopedLock lock(_localContext);
delete _errorTexture; delete _errorTexture;
...@@ -216,8 +216,8 @@ namespace campvis { ...@@ -216,8 +216,8 @@ namespace campvis {
_mainWindow->deinit(); _mainWindow->deinit();
QuadRenderer::deinit(); QuadRenderer::deinit();
// deinit OpenGL and tgt // deinit OpenGL and cgt
tgt::deinitGL(); cgt::deinitGL();
} }
// MainWindow dtor needs a valid CampVisApplication, so we need to call it here instead of during destruction. // MainWindow dtor needs a valid CampVisApplication, so we need to call it here instead of during destruction.
...@@ -227,8 +227,8 @@ namespace campvis { ...@@ -227,8 +227,8 @@ namespace campvis {
OpenGLJobProcessor::deinit(); OpenGLJobProcessor::deinit();
SimpleJobProcessor::deinit(); SimpleJobProcessor::deinit();
tgt::GlContextManager::deinit(); cgt::GlContextManager::deinit();
tgt::deinit(); cgt::deinit();
PropertyWidgetFactory::deinit(); PropertyWidgetFactory::deinit();
ImageRepresentationConverter::deinit(); ImageRepresentationConverter::deinit();
...@@ -238,10 +238,10 @@ namespace campvis { ...@@ -238,10 +238,10 @@ namespace campvis {
} }
int CampVisApplication::run() { int CampVisApplication::run() {
tgtAssert(_initialized, "Tried to run uninitialized CampVisApplication."); cgtAssert(_initialized, "Tried to run uninitialized CampVisApplication.");
// disconnect OpenGL context from this thread so that the other threads can acquire an OpenGL context. // disconnect OpenGL context from this thread so that the other threads can acquire an OpenGL context.
//tgt::GlContextManager::getRef().releaseCurrentContext(); //cgt::GlContextManager::getRef().releaseCurrentContext();
_mainWindow->show(); _mainWindow->show();
...@@ -252,10 +252,10 @@ namespace campvis { ...@@ -252,10 +252,10 @@ namespace campvis {
} }
void CampVisApplication::addPipeline(const std::string& name, AbstractPipeline* pipeline) { void CampVisApplication::addPipeline(const std::string& name, AbstractPipeline* pipeline) {
tgtAssert(pipeline != 0, "Pipeline must not be 0."); cgtAssert(pipeline != 0, "Pipeline must not be 0.");
// create canvas and painter for the pipeline and connect all together // create canvas and painter for the pipeline and connect all together
tgt::QtThreadedCanvas* canvas = new tgt::QtThreadedCanvas("CAMPVis", tgt::ivec2(512, 512)); cgt::QtThreadedCanvas* canvas = new cgt::QtThreadedCanvas("CAMPVis", cgt::ivec2(512, 512));
canvas->init(); canvas->init();
CampVisPainter* painter = new CampVisPainter(canvas, pipeline); CampVisPainter* painter = new CampVisPainter(canvas, pipeline);
...@@ -284,8 +284,8 @@ namespace campvis { ...@@ -284,8 +284,8 @@ namespace campvis {
pipeline->start(); pipeline->start();
} }
void CampVisApplication::initGlContextAndPipeline(tgt::GLCanvas* canvas, AbstractPipeline* pipeline) { void CampVisApplication::initGlContextAndPipeline(cgt::GLCanvas* canvas, AbstractPipeline* pipeline) {
tgt::GlContextManager::getRef().registerContextAndInitGlew(canvas, pipeline->getName()); cgt::GlContextManager::getRef().registerContextAndInitGlew(canvas, pipeline->getName());
pipeline->init(); pipeline->init();
LGL_ERROR; LGL_ERROR;
...@@ -300,7 +300,7 @@ namespace campvis { ...@@ -300,7 +300,7 @@ namespace campvis {
} }
void CampVisApplication::registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock) { void CampVisApplication::registerDockWidget(Qt::DockWidgetArea area, QDockWidget* dock) {
tgtAssert(dock != 0, "Dock widget must not be 0."); cgtAssert(dock != 0, "Dock widget must not be 0.");
_mainWindow->addDockWidget(area, dock); _mainWindow->addDockWidget(area, dock);
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "scripting/glue/luavmstate.h" #include "scripting/glue/luavmstate.h"
#endif #endif
namespace tgt { namespace cgt {
class GLCanvas; class GLCanvas;
class QtThreadedCanvas; class QtThreadedCanvas;
class Texture; class Texture;
...@@ -88,13 +88,13 @@ namespace campvis { ...@@ -88,13 +88,13 @@ namespace campvis {
~CampVisApplication(); ~CampVisApplication();
/** /**
* Initializes tgt, OpenGL, and all pipelines, evaluators and painters. * Initializes cgt, OpenGL, and all pipelines, evaluators and painters.
* Make sure to have everything setup before calling init(). * Make sure to have everything setup before calling init().
*/ */
void init(); void init();
/** /**
* Deinitializes tgt, OpenGL, and all pipelines, evaluators and painters. * Deinitializes cgt, OpenGL, and all pipelines, evaluators and painters.
*/ */
void deinit(); void deinit();
...@@ -153,7 +153,7 @@ namespace campvis { ...@@ -153,7 +153,7 @@ namespace campvis {
sigslot::signal0 s_DataContainersChanged; sigslot::signal0 s_DataContainersChanged;
private: private:
void initGlContextAndPipeline(tgt::GLCanvas* canvas, AbstractPipeline* pipeline); void initGlContextAndPipeline(cgt::GLCanvas* canvas, AbstractPipeline* pipeline);
/// All pipelines /// All pipelines
...@@ -171,12 +171,12 @@ namespace campvis { ...@@ -171,12 +171,12 @@ namespace campvis {
void triggerShaderRebuild(); void triggerShaderRebuild();
/// A local OpenGL context used for initialization /// A local OpenGL context used for initialization
tgt::GLCanvas* _localContext; cgt::GLCanvas* _localContext;
/// Main window hosting GUI stuff /// Main window hosting GUI stuff
MainWindow* _mainWindow; MainWindow* _mainWindow;
/// Error texture to show if there is no output found /// Error texture to show if there is no output found
tgt::Texture* _errorTexture; cgt::Texture* _errorTexture;
/// the global LuaVmState of this application /// the global LuaVmState of this application
LuaVmState* _luaVmState; LuaVmState* _luaVmState;
......
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
namespace campvis { namespace campvis {
const std::string CampVisPainter::loggerCat_ = "CAMPVis.core.CampVisPainter"; const std::string CampVisPainter::loggerCat_ = "CAMPVis.core.CampVisPainter";
CampVisPainter::CampVisPainter(tgt::GLCanvas* canvas, AbstractPipeline* pipeline) CampVisPainter::CampVisPainter(cgt::GLCanvas* canvas, AbstractPipeline* pipeline)
: tgt::Painter(canvas) : cgt::Painter(canvas)
, _pipeline(nullptr) , _pipeline(nullptr)
, _copyShader(nullptr) , _copyShader(nullptr)
, _errorTexture(nullptr) , _errorTexture(nullptr)
{ {
tgtAssert(getCanvas() != nullptr, "The given canvas must not be 0!"); cgtAssert(getCanvas() != nullptr, "The given canvas must not be 0!");
setPipeline(pipeline); setPipeline(pipeline);
} }
...@@ -65,7 +65,7 @@ namespace campvis { ...@@ -65,7 +65,7 @@ namespace campvis {
return; return;
} }
const tgt::ivec2& size = getCanvas()->getSize(); const cgt::ivec2& size = getCanvas()->getSize();
glViewport(0, 0, size.x, size.y); glViewport(0, 0, size.x, size.y);
// try get Data // try get Data
...@@ -75,14 +75,14 @@ namespace campvis { ...@@ -75,14 +75,14 @@ namespace campvis {
// activate the shader // activate the shader
_copyShader->activate(); _copyShader->activate();
tgt::Shader::IgnoreUniformLocationErrorGuard guard(_copyShader); cgt::Shader::IgnoreUniformLocationErrorGuard guard(_copyShader);
// render whatever there is to render // render whatever there is to render
if (rd != nullptr || (repGL != nullptr && repGL->getDimensionality() == 2)) { if (rd != nullptr || (repGL != nullptr && repGL->getDimensionality() == 2)) {
_copyShader->setUniform("_viewMatrix", tgt::mat4::identity); _copyShader->setUniform("_viewMatrix", cgt::mat4::identity);
// bind input textures // bind input textures
tgt::TextureUnit colorUnit; cgt::TextureUnit colorUnit;
if (rd) if (rd)
rd->bindColorTexture(_copyShader, colorUnit); rd->bindColorTexture(_copyShader, colorUnit);
else if (repGL) else if (repGL)
...@@ -94,11 +94,11 @@ namespace campvis { ...@@ -94,11 +94,11 @@ namespace campvis {
// if there is nothing to render, render the error texture // if there is nothing to render, render the error texture
else if (_errorTexture != nullptr) { else if (_errorTexture != nullptr) {
float ratioRatio = static_cast<float>(size.y) / size.x; float ratioRatio = static_cast<float>(size.y) / size.x;
tgt::mat4 viewMatrix = (ratioRatio > 1) ? tgt::mat4::createScale(tgt::vec3(1.f, 1.f / ratioRatio, 1.f)) : tgt::mat4::createScale(tgt::vec3(ratioRatio, 1.f, 1.f)); cgt::mat4 viewMatrix = (ratioRatio > 1) ? cgt::mat4::createScale(cgt::vec3(1.f, 1.f / ratioRatio, 1.f)) : cgt::mat4::createScale(cgt::vec3(ratioRatio, 1.f, 1.f));
_copyShader->setUniform("_viewMatrix", viewMatrix); _copyShader->setUniform("_viewMatrix", viewMatrix);
// bind input textures // bind input textures
tgt::TextureUnit colorUnit; cgt::TextureUnit colorUnit;
colorUnit.activate(); colorUnit.activate();
_errorTexture->bind(); _errorTexture->bind();
_copyShader->setUniform("_colorTexture", colorUnit.getUnitNumber()); _copyShader->setUniform("_colorTexture", colorUnit.getUnitNumber());
...@@ -116,7 +116,7 @@ namespace campvis { ...@@ -116,7 +116,7 @@ namespace campvis {
getCanvas()->swap(); getCanvas()->swap();
} }
void CampVisPainter::sizeChanged(const tgt::ivec2& size) { void CampVisPainter::sizeChanged(const cgt::ivec2& size) {
_pipeline->setRenderTargetSize(size); _pipeline->setRenderTargetSize(size);
} }
...@@ -126,8 +126,8 @@ namespace campvis { ...@@ -126,8 +126,8 @@ namespace campvis {
_copyShader->setAttributeLocation(0, "in_Position"); _copyShader->setAttributeLocation(0, "in_Position");
_copyShader->setAttributeLocation(1, "in_TexCoords"); _copyShader->setAttributeLocation(1, "in_TexCoords");
} }
catch (tgt::Exception& e) { catch (cgt::Exception& e) {
LFATAL("Encountered tgt::Exception: " << e.what()); LFATAL("Encountered cgt::Exception: " << e.what());
} }
} }
...@@ -142,7 +142,7 @@ namespace campvis { ...@@ -142,7 +142,7 @@ namespace campvis {
} }
void CampVisPainter::setPipeline(AbstractPipeline* pipeline) { void CampVisPainter::setPipeline(AbstractPipeline* pipeline) {
tgtAssert(pipeline != nullptr, "The given pipeline must not be 0."); cgtAssert(pipeline != nullptr, "The given pipeline must not be 0.");
if (_pipeline != nullptr) { if (_pipeline != nullptr) {
if (getCanvas()->getEventHandler() != nullptr) if (getCanvas()->getEventHandler() != nullptr)
...@@ -159,12 +159,12 @@ namespace campvis { ...@@ -159,12 +159,12 @@ namespace campvis {
// do nothing, as the painting is entirely managed by the pipeline. // do nothing, as the painting is entirely managed by the pipeline.
} }
void CampVisPainter::setCanvas(tgt::GLCanvas* canvas) { void CampVisPainter::setCanvas(cgt::GLCanvas* canvas) {
tgtAssert(dynamic_cast<tgt::QtThreadedCanvas*>(canvas) != nullptr, "Canvas must be of type QtThreadedCanvas!"); cgtAssert(dynamic_cast<cgt::QtThreadedCanvas*>(canvas) != nullptr, "Canvas must be of type QtThreadedCanvas!");
Painter::setCanvas(canvas); Painter::setCanvas(canvas);
} }
void CampVisPainter::setErrorTexture(tgt::Texture* texture) { void CampVisPainter::setErrorTexture(cgt::Texture* texture) {
_errorTexture = texture; _errorTexture = texture;
} }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "cgt/logmanager.h" #include "cgt/logmanager.h"
#include "cgt/painter.h" #include "cgt/painter.h"
namespace tgt { namespace cgt {
class Shader; class Shader;
class QtThreadedCanvas; class QtThreadedCanvas;
class Texture; class Texture;
...@@ -45,14 +45,14 @@ namespace campvis { ...@@ -45,14 +45,14 @@ namespace campvis {
/** /**
* Painter class for CAMPVis, rendering the render target of an AbstractPipeline. * Painter class for CAMPVis, rendering the render target of an AbstractPipeline.
*/ */
class CampVisPainter : public tgt::Painter, public sigslot::has_slots { class CampVisPainter : public cgt::Painter, public sigslot::has_slots {
public: public:
/** /**
* Creates a new CampVisPainter rendering the render target of \a pipeline on \a canvas. * Creates a new CampVisPainter rendering the render target of \a pipeline on \a canvas.
* \param canvas Canvas to render on * \param canvas Canvas to render on
* \param pipeline Pipeline to render * \param pipeline Pipeline to render
*/ */
CampVisPainter(tgt::GLCanvas* canvas, AbstractPipeline* pipeline); CampVisPainter(cgt::GLCanvas* canvas, AbstractPipeline* pipeline);
/** /**
* Destructor, stops and waits for the rendering thread if it's still running. * Destructor, stops and waits for the rendering thread if it's still running.
...@@ -64,8 +64,8 @@ namespace campvis { ...@@ -64,8 +64,8 @@ namespace campvis {
*/ */
virtual void repaint(); virtual void repaint();
/// \see tgt::Painter::sizeChanged /// \see cgt::Painter::sizeChanged
virtual void sizeChanged(const tgt::ivec2& size); virtual void sizeChanged(const cgt::ivec2& size);
/** /**
* Initializes the painter, i.e. loads the OpenGL shader. * Initializes the painter, i.e. loads the OpenGL shader.
...@@ -81,7 +81,7 @@ namespace campvis { ...@@ -81,7 +81,7 @@ namespace campvis {
* Sets the target canvas for rendering * Sets the target canvas for rendering
* \param canvas Canvas to render on, must be of type QtThreadedCanvas * \param canvas Canvas to render on, must be of type QtThreadedCanvas
*/ */
virtual void setCanvas(tgt::GLCanvas* canvas); virtual void setCanvas(cgt::GLCanvas* canvas);
/** /**
* Pipeline with the render target to render. * Pipeline with the render target to render.
...@@ -89,7 +89,7 @@ namespace campvis { ...@@ -89,7 +89,7 @@ namespace campvis {
*/ */
void setPipeline(AbstractPipeline* pipeline); void setPipeline(AbstractPipeline* pipeline);
void setErrorTexture(tgt::Texture* texture); void setErrorTexture(cgt::Texture* texture);
private: private:
...@@ -101,8 +101,8 @@ namespace campvis { ...@@ -101,8 +101,8 @@ namespace campvis {
static const std::string loggerCat_; static const std::string loggerCat_;
AbstractPipeline* _pipeline; ///< Pipeline to render AbstractPipeline* _pipeline; ///< Pipeline to render
tgt::Shader* _copyShader; ///< Shader for copying the render target to the framebuffer. cgt::Shader* _copyShader; ///< Shader for copying the render target to the framebuffer.
tgt::Texture* _errorTexture; ///< Pointer to error texture cgt::Texture* _errorTexture; ///< Pointer to error texture
}; };
} }
......