Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b1a8b51e

Commit b1a8b51e authored 4 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/glrender' into 'master'

Basic OpenGL renderer

See merge request nicolas.pope/ftl!350

parents 1283ecd9 f03ddbd0

No related branches found

No related tags found

1 merge request!350Basic OpenGL renderer

Pipeline #32903 passed 4 years ago

Stage: all

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui2/src/views/camera.cpp 4 additions, 1 deletion

applications/gui2/src/views/camera.cpp
components/renderers/cpp/CMakeLists.txt 1 addition, 0 deletions

components/renderers/cpp/CMakeLists.txt
components/renderers/cpp/include/ftl/render/GLRender.hpp 75 additions, 0 deletions

components/renderers/cpp/include/ftl/render/GLRender.hpp
components/renderers/cpp/src/GLRender.cpp 322 additions, 0 deletions

components/renderers/cpp/src/GLRender.cpp
components/renderers/cpp/src/gltexture.cpp 5 additions, 5 deletions

components/renderers/cpp/src/gltexture.cpp
components/streams/src/renderers/screen_render.cpp 45 additions, 7 deletions

components/streams/src/renderers/screen_render.cpp
components/streams/src/renderers/screen_render.hpp 7 additions, 2 deletions

components/streams/src/renderers/screen_render.hpp

with 459 additions and 15 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