Commit 1817ed3d authored by Mathieu Faverge's avatar Mathieu Faverge

Switch VBO as default and add a few fixes to compile with QT5, however it doesn't work with it

parent 7bcd53b7
......@@ -68,7 +68,7 @@ find_package(OpenGL)
option(VITE_ENABLE_SERIALIZATION
"Enable the support of Boost Serialization." OFF)
option(VITE_ENABLE_VBO
"Enable the support of VBO." OFF)
"Enable the support of VBO." ON)
option(VITE_ENABLE_MT_PARSERS
"Enable multi-threading in parsers." OFF)
......@@ -126,6 +126,10 @@ endif(VITE_ENABLE_SERIALIZATION)
if(VITE_ENABLE_VBO)
find_package(GLEW)
# check_include_files(glm/glm.hpp HAVE_GLM_H)
# if (NOT HAVE_GLM_H)
# message(FATAL_ERROR "libglm-dev package is required")
# endif()
endif(VITE_ENABLE_VBO)
if(VITE_ENABLE_OTF)
......
......@@ -48,6 +48,63 @@
#define RENDER_HPP
class EntityValue;
struct Container_text_;
/*template<typename T>
class CSingleton
{
public:
static T& Instance()
{
static T me;
return me;
}
};
*/
/*!
* \brief Structure used to store arrow information.
*/
struct Arrow_{
/*!
* \brief Coordinates.
*/
Element_pos start_time, end_time, start_height, end_height;
/*!
* \brief Colors.
*/
Element_col red, green, blue;
};
/*!
* \brief Structure used to store event information.
*/
struct Event_{
/*!
* \brief Coordinates and radius.
*/
Element_pos time, height, container_height;
/*!
* \brief Colors.
*/
Element_col red, green, blue;
};
/*!
* \brief Structure used to store event information.
*/
struct Variable_text_{
/*!
* \brief Coordinates and radius.
*/
Element_pos y;
Element_pos value;
};
/*!
* \brief This class provides an interface for render classes like OpenGL or SVG.
*/
......
......@@ -44,8 +44,8 @@
*\file Render_alternate.hpp
*/
#ifndef RENDER_OPENGL_HPP
#define RENDER_OPENGL_HPP
#ifndef RENDER_ALTERNATE_HPP
#define RENDER_ALTERNATE_HPP
#include <stack>
#include <cmath>
......@@ -75,14 +75,6 @@
class Render_alternate;
class Interface_console;
class StateType;
struct Container_text_;
/*!
* \brief Structure used to store text for variables.
*/
struct Variable_text_{
Element_pos y;
Element_pos value;
};
/*!
* \def _DRAWING_CONTAINER_HEIGHT_DEFAULT
......
......@@ -67,62 +67,6 @@
#include "render/Ruler.hpp"
#include "render/GanttDiagram.hpp"
struct Container_text_;
/*template<typename T>
class CSingleton
{
public:
static T& Instance()
{
static T me;
return me;
}
};
*/
/*!
* \brief Structure used to store arrow information.
*/
struct Arrow_{
/*!
* \brief Coordinates.
*/
Element_pos start_time, end_time, start_height, end_height;
/*!
* \brief Colors.
*/
Element_col red, green, blue;
};
/*!
* \brief Structure used to store event information.
*/
struct Event_{
/*!
* \brief Coordinates and radius.
*/
Element_pos time, height, container_height;
/*!
* \brief Colors.
*/
Element_col red, green, blue;
};
/*!
* \brief Structure used to store event information.
*/
struct Variable_text_{
/*!
* \brief Coordinates and radius.
*/
Element_pos y;
Element_pos value;
};
/*!
* \brief This class redefined the OpenGL widget - QGLWidget - to display the trace.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment