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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
a002cfca
Commit
a002cfca
authored
May 25, 2011
by
Kenneth Vanhoey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New folder for shaders in Utils/Shaders/
parent
e9198c9b
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
30 additions
and
25 deletions
+30
-25
Apps/Examples/extrusionView.cpp
Apps/Examples/extrusionView.cpp
+2
-2
Apps/Examples/polyhedronsView.cpp
Apps/Examples/polyhedronsView.cpp
+2
-2
Apps/Tuto/tp_master.cpp
Apps/Tuto/tp_master.cpp
+2
-2
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+1
-1
Apps/Tuto/tuto2.cpp
Apps/Tuto/tuto2.cpp
+1
-1
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+3
-2
Apps/Tuto/tuto4.cpp
Apps/Tuto/tuto4.cpp
+2
-2
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+2
-2
Apps/Tuto/tuto_ogl3.h
Apps/Tuto/tuto_ogl3.h
+1
-1
include/Utils/Shaders/shaderColorPerVertex.h
include/Utils/Shaders/shaderColorPerVertex.h
+0
-0
include/Utils/Shaders/shaderFlat.h
include/Utils/Shaders/shaderFlat.h
+0
-0
include/Utils/Shaders/shaderPhong.h
include/Utils/Shaders/shaderPhong.h
+0
-0
include/Utils/Shaders/shaderSimpleColor.h
include/Utils/Shaders/shaderSimpleColor.h
+0
-0
include/Utils/Shaders/shaderVectorPerVertex.h
include/Utils/Shaders/shaderVectorPerVertex.h
+0
-0
src/Algo/Render/topo3Render.cpp
src/Algo/Render/topo3Render.cpp
+3
-2
src/Algo/Render/topoRender.cpp
src/Algo/Render/topoRender.cpp
+3
-2
src/Utils/Shaders/shaderColorPerVertex.cpp
src/Utils/Shaders/shaderColorPerVertex.cpp
+2
-1
src/Utils/Shaders/shaderFlat.cpp
src/Utils/Shaders/shaderFlat.cpp
+1
-1
src/Utils/Shaders/shaderPhong.cpp
src/Utils/Shaders/shaderPhong.cpp
+1
-1
src/Utils/Shaders/shaderSimpleColor.cpp
src/Utils/Shaders/shaderSimpleColor.cpp
+1
-1
src/Utils/Shaders/shaderVectorPerVertex.cpp
src/Utils/Shaders/shaderVectorPerVertex.cpp
+1
-1
src/Utils/drawer.cpp
src/Utils/drawer.cpp
+2
-1
No files found.
Apps/Examples/extrusionView.cpp
View file @
a002cfca
...
...
@@ -39,8 +39,8 @@
#include "Topology/generic/parameters.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderFlat.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderFlat.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include <vector>
...
...
Apps/Examples/polyhedronsView.cpp
View file @
a002cfca
...
...
@@ -39,8 +39,8 @@
#include "Topology/generic/parameters.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderFlat.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderFlat.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/tp_master.cpp
View file @
a002cfca
...
...
@@ -44,8 +44,8 @@
#include "Algo/Import/import.h"
#include "Algo/Geometry/boundingbox.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/shaderPhong.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderPhong.h"
#include "Utils/drawer.h"
...
...
Apps/Tuto/tuto1.cpp
View file @
a002cfca
...
...
@@ -35,7 +35,7 @@
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include <glm/gtc/type_ptr.hpp>
...
...
Apps/Tuto/tuto2.cpp
View file @
a002cfca
...
...
@@ -30,7 +30,7 @@
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include "Utils/drawer.h"
...
...
Apps/Tuto/tuto3.cpp
View file @
a002cfca
...
...
@@ -31,8 +31,9 @@
#include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "tuto3.h"
...
...
Apps/Tuto/tuto4.cpp
View file @
a002cfca
...
...
@@ -37,8 +37,8 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Algo/Render/GL2/topoRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/shaderFlat.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderFlat.h"
#include "Utils/cgognStream.h"
...
...
Apps/Tuto/tuto5.cpp
View file @
a002cfca
...
...
@@ -34,7 +34,7 @@
#include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
#include "Algo/Modelisation/primitives3d.h"
#include "Algo/Modelisation/polyhedron.h"
...
...
@@ -46,7 +46,7 @@
#include "Utils/text3d.h"
#include "Utils/pointSprite.h"
#include "Utils/shaderVectorPerVertex.h"
#include "Utils/
Shaders/
shaderVectorPerVertex.h"
#include "Utils/cgognStream.h"
#include "Algo/Render/SVG/mapSVGRender.h"
...
...
Apps/Tuto/tuto_ogl3.h
View file @
a002cfca
...
...
@@ -38,7 +38,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Geometry/vector_gen.h"
#include "Utils/shaderPhong.h"
#include "Utils/
Shaders/
shaderPhong.h"
#include <QApplication>
#include <QDesktopWidget>
...
...
include/Utils/shaderColorPerVertex.h
→
include/Utils/
Shaders/
shaderColorPerVertex.h
View file @
a002cfca
File moved
include/Utils/shaderFlat.h
→
include/Utils/
Shaders/
shaderFlat.h
View file @
a002cfca
File moved
include/Utils/shaderPhong.h
→
include/Utils/
Shaders/
shaderPhong.h
View file @
a002cfca
File moved
include/Utils/shaderSimpleColor.h
→
include/Utils/
Shaders/
shaderSimpleColor.h
View file @
a002cfca
File moved
include/Utils/shaderVectorPerVertex.h
→
include/Utils/
Shaders/
shaderVectorPerVertex.h
View file @
a002cfca
File moved
src/Algo/Render/topo3Render.cpp
View file @
a002cfca
...
...
@@ -24,8 +24,9 @@
#include "Algo/Render/GL2/topo3Render.h"
#include "Topology/generic/dart.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include <string.h>
...
...
src/Algo/Render/topoRender.cpp
View file @
a002cfca
...
...
@@ -23,8 +23,9 @@
*******************************************************************************/
#include "Algo/Render/GL2/topoRender.h"
#include "Utils/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
namespace
CGoGN
{
...
...
src/Utils/shaderColorPerVertex.cpp
→
src/Utils/
Shaders/
shaderColorPerVertex.cpp
View file @
a002cfca
...
...
@@ -23,7 +23,8 @@
*******************************************************************************/
#include <GL/glew.h>
#include "Utils/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
namespace
CGoGN
{
...
...
src/Utils/shaderFlat.cpp
→
src/Utils/
Shaders/
shaderFlat.cpp
View file @
a002cfca
...
...
@@ -24,7 +24,7 @@
#include <string.h>
#include <GL/glew.h>
#include "Utils/shaderFlat.h"
#include "Utils/
Shaders/
shaderFlat.h"
namespace
CGoGN
{
...
...
src/Utils/shaderPhong.cpp
→
src/Utils/
Shaders/
shaderPhong.cpp
View file @
a002cfca
...
...
@@ -23,7 +23,7 @@
*******************************************************************************/
#include <GL/glew.h>
#include "Utils/shaderPhong.h"
#include "Utils/
Shaders/
shaderPhong.h"
namespace
CGoGN
{
...
...
src/Utils/shaderSimpleColor.cpp
→
src/Utils/
Shaders/
shaderSimpleColor.cpp
View file @
a002cfca
...
...
@@ -23,7 +23,7 @@
*******************************************************************************/
#include <GL/glew.h>
#include "Utils/shaderSimpleColor.h"
#include "Utils/
Shaders/
shaderSimpleColor.h"
namespace
CGoGN
{
...
...
src/Utils/shaderVectorPerVertex.cpp
→
src/Utils/
Shaders/
shaderVectorPerVertex.cpp
View file @
a002cfca
...
...
@@ -23,7 +23,7 @@
*******************************************************************************/
#include <GL/glew.h>
#include "Utils/shaderVectorPerVertex.h"
#include "Utils/
Shaders/
shaderVectorPerVertex.h"
namespace
CGoGN
{
...
...
src/Utils/drawer.cpp
View file @
a002cfca
...
...
@@ -23,7 +23,8 @@
*******************************************************************************/
#include "Utils/drawer.h"
#include "Utils/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
namespace
CGoGN
...
...
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