Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
917a9c5a
Commit
917a9c5a
authored
Nov 22, 2012
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove dependancies
parent
66f66943
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
195 additions
and
154 deletions
+195
-154
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+1
-0
Apps/Examples/concave_rendering.cpp
Apps/Examples/concave_rendering.cpp
+1
-0
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+1
-0
Apps/Examples/mcmesh.h
Apps/Examples/mcmesh.h
+1
-0
Apps/Examples/texturesExample.cpp
Apps/Examples/texturesExample.cpp
+1
-0
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+1
-1
Apps/Tuto/tuto2.h
Apps/Tuto/tuto2.h
+1
-0
Apps/Tuto/tuto5.h
Apps/Tuto/tuto5.h
+1
-1
Apps/Tuto/tuto_histo.h
Apps/Tuto/tuto_histo.h
+1
-1
Apps/Tuto/tuto_mt.h
Apps/Tuto/tuto_mt.h
+1
-0
include/Algo/Histogram/histogram.h
include/Algo/Histogram/histogram.h
+1
-1
include/Algo/Render/GL2/colorPerFaceRender.h
include/Algo/Render/GL2/colorPerFaceRender.h
+1
-1
include/Algo/Render/GL2/explodeVolumeRender.h
include/Algo/Render/GL2/explodeVolumeRender.h
+1
-1
include/Algo/Render/GL2/mapRender.h
include/Algo/Render/GL2/mapRender.h
+1
-1
include/Algo/Render/GL2/mapRender.hpp
include/Algo/Render/GL2/mapRender.hpp
+1
-1
include/Algo/Render/GL2/topo3Render.h
include/Algo/Render/GL2/topo3Render.h
+1
-1
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+1
-1
include/Utils/GLSLShader.h
include/Utils/GLSLShader.h
+2
-1
include/Utils/frameManipulator.h
include/Utils/frameManipulator.h
+1
-1
include/Utils/pickables.h
include/Utils/pickables.h
+1
-1
include/Utils/vbo.h
include/Utils/vbo.h
+28
-138
include/Utils/vbo_base.h
include/Utils/vbo_base.h
+142
-0
src/Utils/drawer.cpp
src/Utils/drawer.cpp
+1
-1
src/Utils/text3d.cpp
src/Utils/text3d.cpp
+2
-1
src/Utils/vbo.cpp
src/Utils/vbo.cpp
+1
-1
No files found.
Apps/Examples/clipping.cpp
View file @
917a9c5a
...
...
@@ -23,6 +23,7 @@
*******************************************************************************/
#include "clipping.h"
#include "Utils/vbo.h"
#include "Utils/static_assert.h"
/*******************************************************************************
...
...
Apps/Examples/concave_rendering.cpp
View file @
917a9c5a
...
...
@@ -35,6 +35,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <glm/gtc/type_ptr.hpp>
...
...
Apps/Examples/extrusionView.cpp
View file @
917a9c5a
...
...
@@ -40,6 +40,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <vector>
...
...
Apps/Examples/mcmesh.h
View file @
917a9c5a
...
...
@@ -38,6 +38,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/MC/marchingcube.h"
...
...
Apps/Examples/texturesExample.cpp
View file @
917a9c5a
...
...
@@ -25,6 +25,7 @@
#include "texturesExample.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h"
#include "Utils/vbo.h"
TexView
::
TexView
()
:
m_render
(
NULL
),
...
...
Apps/Examples/viewer.h
View file @
917a9c5a
...
...
@@ -46,7 +46,7 @@
#include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/pointSprite.h"
#include "Utils/text3d.h"
#include "Utils/vbo
Render
.h"
#include "Utils/vbo.h"
#include "Utils/Qt/qtInputs.h"
...
...
Apps/Tuto/tuto2.h
View file @
917a9c5a
...
...
@@ -41,6 +41,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/tuto5.h
View file @
917a9c5a
...
...
@@ -45,7 +45,7 @@
#include "Topology/generic/cellmarker.h"
#include "Utils/text3d.h"
#include "Utils/vbo.h"
#include "Utils/pointSprite.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h"
...
...
Apps/Tuto/tuto_histo.h
View file @
917a9c5a
...
...
@@ -35,7 +35,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
#include "Algo/Histogram/histogram.h"
#include "Utils/Qt/qthistodraw.h"
...
...
Apps/Tuto/tuto_mt.h
View file @
917a9c5a
...
...
@@ -37,6 +37,7 @@
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/vbo.h"
#include "Utils/cgognStream.h"
#include "Utils/Qt/qtSimple.h"
...
...
include/Algo/Histogram/histogram.h
View file @
917a9c5a
...
...
@@ -33,7 +33,7 @@
#include "Topology/generic/cellmarker.h"
#include "Geometry/vector_gen.h"
#include "Utils/colorMaps.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
namespace
CGoGN
...
...
include/Algo/Render/GL2/colorPerFaceRender.h
View file @
917a9c5a
...
...
@@ -29,7 +29,7 @@
#include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/GLSLShader.h"
...
...
include/Algo/Render/GL2/explodeVolumeRender.h
View file @
917a9c5a
...
...
@@ -31,7 +31,7 @@
#include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/Shaders/shaderExplodeVolumes.h"
#include "Utils/Shaders/shaderExplodeVolumesLines.h"
...
...
include/Algo/Render/GL2/mapRender.h
View file @
917a9c5a
...
...
@@ -33,13 +33,13 @@
#include <set>
#include <utility>
#include "Utils/gl_def.h"
#include "Topology/generic/dart.h"
#include "Topology/generic/functor.h"
#include "Topology/generic/attributeHandler.h"
#include "Container/convert.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
// forward definition
namespace
CGoGN
{
namespace
Utils
{
class
GLSLShader
;
}
}
...
...
include/Algo/Render/GL2/mapRender.hpp
View file @
917a9c5a
...
...
@@ -27,7 +27,7 @@
#include "Topology/generic/cellmarker.h"
#include "Topology/generic/traversorCell.h"
#include "Utils/vbo.h"
//
#include "Utils/vbo.h"
#include "Geometry/intersection.h"
#include "Algo/Geometry/normal.h"
...
...
include/Algo/Render/GL2/topo3Render.h
View file @
917a9c5a
...
...
@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/svg.h"
// forward
...
...
include/Algo/Render/GL2/topoRender.h
View file @
917a9c5a
...
...
@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/svg.h"
// forward
...
...
include/Utils/GLSLShader.h
View file @
917a9c5a
...
...
@@ -31,8 +31,9 @@
#include "Utils/gl_def.h"
#include "Utils/os_spec.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/gl_matrices.h"
#include "Utils/cgognStream.h"
#include "glm/glm.hpp"
#include <GL/glew.h>
...
...
include/Utils/frameManipulator.h
View file @
917a9c5a
...
...
@@ -26,7 +26,7 @@
#ifndef __FRAMEMANIPULATOR_H_
#define __FRAMEMANIPULATOR_H_
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "glm/glm.hpp"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/pickables.h"
...
...
include/Utils/pickables.h
View file @
917a9c5a
...
...
@@ -26,7 +26,7 @@
#ifndef __PICKABLES_H_
#define __PICKABLES_H_
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "glm/glm.hpp"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderSimpleColor.h"
...
...
include/Utils/vbo.h
View file @
917a9c5a
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.unistra.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __CGoGN_GLSL_VBO__
#define __CGoGN_GLSL_VBO__
#include <vector>
#include "Utils/gl_def.h"
#include "Topology/generic/attributeHandler.h"
#include "Container/convert.h"
namespace
CGoGN
{
namespace
Utils
{
class
GLSLShader
;
/**
* Encapsulation of OpenGL Vertex Buffer Object
* Manage
* - alloc /release of GL buffer
* - ref by Shaders
* - size of data (invidual cells)
*/
class
VBO
{
protected:
// VBO id
CGoGNGLuint
m_id
;
// size of data (in floats)
unsigned
int
m_data_size
;
// shaders that ref this vbo
std
::
vector
<
GLSLShader
*>
m_refs
;
unsigned
int
m_nbElts
;
mutable
bool
m_lock
;
public:
/**
* constructor: allocate the OGL VBO
*/
VBO
();
/**
* copy constructor, new VBO copy content
*/
VBO
(
const
VBO
&
vbo
);
/**
* destructor: release the OGL VBO and clean references between VBO/Shaders
*/
~
VBO
();
/**
* get id of vbo
*/
GLuint
id
()
const
{
return
*
m_id
;
}
/**
* get dataSize
*/
unsigned
int
dataSize
()
const
{
return
m_data_size
;
}
/**
* set the data size (in number of float)
*/
void
setDataSize
(
unsigned
int
ds
)
{
m_data_size
=
ds
;
}
/**
* get nb element in vbo (vertices, colors ...)
*/
unsigned
int
nbElts
()
{
return
m_nbElts
;
}
/**
* bind array vbo
*/
void
bind
()
const
{
glBindBuffer
(
GL_ARRAY_BUFFER
,
*
m_id
);
}
/**
* alloc buffer of same size than parameter
*/
void
sameAllocSameBufferSize
(
const
VBO
&
vbo
);
/**
* update data from attribute handler to the vbo
*/
template
<
typename
ATTR_HANDLER
>
void
updateData
(
const
ATTR_HANDLER
&
attrib
);
/**
* update data from attribute handler to the vbo, with conversion
*/
template
<
typename
ATTR_HANDLER
>
void
updateData
(
const
ATTR_HANDLER
&
attrib
,
ConvertAttrib
*
conv
);
/**
* update data from given data vector
*/
template
<
typename
T
>
void
updateData
(
std
::
vector
<
T
>&
data
);
void
*
lockPtr
();
const
void
*
lockPtr
()
const
;
void
releasePtr
()
const
;
void
copyData
(
void
*
ptr
)
const
;
void
allocate
(
unsigned
int
nbElts
);
};
}
// namespace Utils
}
// namespace CGoGN
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.unistra.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __CGoGN_VBO__
#define __CGoGN_VBO__
#include "Utils/vbo_base.h"
#include "Utils/vbo.hpp"
#endif
include/Utils/vbo_base.h
0 → 100644
View file @
917a9c5a
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.unistra.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __CGoGN_GLSL_VBO__
#define __CGoGN_GLSL_VBO__
#include <vector>
#include "Utils/gl_def.h"
#include "Container/convert.h"
namespace
CGoGN
{
namespace
Utils
{
class
GLSLShader
;
/**
* Encapsulation of OpenGL Vertex Buffer Object
* Manage
* - alloc /release of GL buffer
* - ref by Shaders
* - size of data (invidual cells)
*/
class
VBO
{
protected:
// VBO id
CGoGNGLuint
m_id
;
// size of data (in floats)
unsigned
int
m_data_size
;
// shaders that ref this vbo
std
::
vector
<
GLSLShader
*>
m_refs
;
unsigned
int
m_nbElts
;
mutable
bool
m_lock
;
public:
/**
* constructor: allocate the OGL VBO
*/
VBO
();
/**
* copy constructor, new VBO copy content
*/
VBO
(
const
VBO
&
vbo
);
/**
* destructor: release the OGL VBO and clean references between VBO/Shaders
*/
~
VBO
();
/**
* get id of vbo
*/
GLuint
id
()
const
{
return
*
m_id
;
}
/**
* get dataSize
*/
unsigned
int
dataSize
()
const
{
return
m_data_size
;
}
/**
* set the data size (in number of float)
*/
void
setDataSize
(
unsigned
int
ds
)
{
m_data_size
=
ds
;
}
/**
* get nb element in vbo (vertices, colors ...)
*/
unsigned
int
nbElts
()
{
return
m_nbElts
;
}
/**
* bind array vbo
*/
void
bind
()
const
{
glBindBuffer
(
GL_ARRAY_BUFFER
,
*
m_id
);
}
/**
* alloc buffer of same size than parameter
*/
void
sameAllocSameBufferSize
(
const
VBO
&
vbo
);
/**
* update data from attribute handler to the vbo
* @warning use only with include vbo.h (not vbo_base.h)
*/
template
<
typename
ATTR_HANDLER
>
void
updateData
(
const
ATTR_HANDLER
&
attrib
);
/**
* update data from attribute handler to the vbo, with conversion
* @warning use only with include vbo.h (not vbo_base.h)
*/
template
<
typename
ATTR_HANDLER
>
void
updateData
(
const
ATTR_HANDLER
&
attrib
,
ConvertAttrib
*
conv
);
/**
* update data from given data vector
* @warning use only with include vbo.h (not vbo_base.h)
*/
template
<
typename
T
>
void
updateData
(
std
::
vector
<
T
>&
data
);
void
*
lockPtr
();
const
void
*
lockPtr
()
const
;
void
releasePtr
()
const
;
void
copyData
(
void
*
ptr
)
const
;
void
allocate
(
unsigned
int
nbElts
);
};
}
// namespace Utils
}
// namespace CGoGN
#endif
src/Utils/drawer.cpp
View file @
917a9c5a
...
...
@@ -26,7 +26,7 @@
#include "Utils/drawer.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/svg.h"
namespace
CGoGN
...
...
src/Utils/text3d.cpp
View file @
917a9c5a
...
...
@@ -23,8 +23,9 @@
*******************************************************************************/
#include "Utils/text3d.h"
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/svg.h"
#include "Utils/gzstream.h"
namespace
CGoGN
{
...
...
src/Utils/vbo.cpp
View file @
917a9c5a
...
...
@@ -22,7 +22,7 @@
* *
*******************************************************************************/
#include "Utils/vbo.h"
#include "Utils/vbo
_base
.h"
#include "Utils/GLSLShader.h"
#include <stdio.h>
#include <string.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment