Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TSBK03 Project
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

36ab3401

Commit 36ab3401 authored 5 months ago by Martin Högstedt

Downloads
- Plain Diff

Merge branch 'metaballs' into 'main'

added clang formatter to keep cpp files consistent and formatted main

See merge request !1

parents 90689ebb b3948c4c

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.clang-format 246 additions, 0 deletions

.clang-format
models/cube.obj 38 additions, 0 deletions

models/cube.obj
models/wide_cube.obj 38 additions, 0 deletions

models/wide_cube.obj
shaders/basic.vert 1 addition, 1 deletion

shaders/basic.vert
shaders/waterfall.frag 83 additions, 3 deletions

shaders/waterfall.frag
shaders/waterfall.vert 21 additions, 0 deletions

shaders/waterfall.vert
src/main.cpp 201 additions, 208 deletions

src/main.cpp
src/object.h 18 additions, 0 deletions

src/object.h
src/waterfall.cpp 107 additions, 0 deletions

src/waterfall.cpp
src/waterfall.h 41 additions, 0 deletions

src/waterfall.h

with 794 additions and 212 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