Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

glow-samples
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

b4499a58

Commit b4499a58 authored 6 years ago by Jonathan Kunstwald

Downloads
- Plain Diff

Merge branch 'master' into feature/jk-dev

parents c571ff43 5aa6fcd8

Branches

No related tags found

No related merge requests found

Changes 12

Expand all Show whitespace changes

Inline Side-by-side

Showing

.gitmodules 0 additions, 3 deletions

.gitmodules
CMakeLists.txt 1 addition, 7 deletions

CMakeLists.txt
extern/doctest 0 additions, 1 deletion

extern/doctest
samples/demo/material/MaterialSample.cc 0 additions, 5 deletions

samples/demo/material/MaterialSample.cc
samples/wip/grass/GrassSample.hh 0 additions, 2 deletions

samples/wip/grass/GrassSample.hh
samples/wip/rendering-pipeline/RenderingPipelineSample.hh 1 addition, 1 deletion

samples/wip/rendering-pipeline/RenderingPipelineSample.hh
samples/wip/voxels/VoxelSample.cc 1 addition, 1 deletion

samples/wip/voxels/VoxelSample.cc
tests/doctest.cc 3320 additions, 0 deletions

tests/doctest.cc
tests/doctest.hh 2673 additions, 0 deletions

tests/doctest.hh
tests/glow-extras/viewer/traits.cc 1 addition, 1 deletion

tests/glow-extras/viewer/traits.cc
tests/glow-extras/viewer/views.cc 36 additions, 0 deletions

tests/glow-extras/viewer/views.cc
tests/main.cc 1 addition, 2 deletions

tests/main.cc

with 6034 additions and 23 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