Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

acgl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

77fdffe3

Commit 77fdffe3 authored 12 years ago by Robert Menzel

Downloads
- Plain Diff

Merge branch 'experimental' of...

Merge branch 'experimental' of ssh://beatrix.informatik.rwth-aachen.de/data/git-repository/acgl/libraries/acgl into experimental

parents c33c6cc1 b7a3e826

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

include/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.hh 7 additions, 6 deletions

include/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.hh
include/ACGL/OpenGL/Objects/Texture.hh 22 additions, 7 deletions

include/ACGL/OpenGL/Objects/Texture.hh
include/ACGL/OpenGL/Objects/VertexArrayObject.hh 1 addition, 1 deletion

include/ACGL/OpenGL/Objects/VertexArrayObject.hh
include/ACGL/Scene/GenericCamera.hh 2 additions, 0 deletions

include/ACGL/Scene/GenericCamera.hh
src/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.cc 2 additions, 2 deletions

src/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.cc
src/ACGL/OpenGL/Data/TextureDataLoadStore.cc 1 addition, 0 deletions

src/ACGL/OpenGL/Data/TextureDataLoadStore.cc
src/ACGL/OpenGL/InitStaticFileTypes.cc 1 addition, 1 deletion

src/ACGL/OpenGL/InitStaticFileTypes.cc
src/ACGL/OpenGL/Objects/Texture.cc 15 additions, 11 deletions

src/ACGL/OpenGL/Objects/Texture.cc
src/ACGL/OpenGL/Objects/VertexArrayObject.cc 3 additions, 0 deletions

src/ACGL/OpenGL/Objects/VertexArrayObject.cc

with 54 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment