Merge branch 'feature-terrain' into develop (14e42977) · Commits · Onuralp SEZER / Game Library · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Game Library
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Service Desk
- Model experiments

Snippets Groups Projects

14e42977

Commit 14e42977 authored 3 years ago by Joseph Walton-Rivers

Downloads
- Plain Diff

Merge branch 'feature-terrain' into develop

parents 10e48cef 7fa0d777

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

demo/main.cpp 16 additions, 2 deletions

demo/main.cpp
fggl/CMakeLists.txt 3 additions, 2 deletions

fggl/CMakeLists.txt
fggl/data/heightmap.cpp 107 additions, 0 deletions

fggl/data/heightmap.cpp
fggl/data/heightmap.h 44 additions, 0 deletions

fggl/data/heightmap.h
fggl/data/model.cpp 1 addition, 1 deletion

fggl/data/model.cpp
fggl/data/model.hpp 7 additions, 4 deletions

fggl/data/model.hpp
fggl/gfx/ogl/compat.hpp 19 additions, 5 deletions

fggl/gfx/ogl/compat.hpp
fggl/gfx/ogl/renderer.cpp 12 additions, 2 deletions

fggl/gfx/ogl/renderer.cpp
fggl/gfx/ogl/renderer.hpp 6 additions, 0 deletions

fggl/gfx/ogl/renderer.hpp

with 215 additions and 16 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