From fcdb5b5f1d9385591f897978a588867def07e284 Mon Sep 17 00:00:00 2001
From: Philip Trettner <Philip.Trettner@rwth-aachen.de>
Date: Wed, 12 Feb 2020 17:18:20 +0100
Subject: [PATCH] adapted samples to new tg
---
extern/glow | 2 +-
extern/glow-extras | 2 +-
extern/polymesh | 2 +-
extern/typed-geometry | 2 +-
samples/wip/vector-2D/Vector2DSample.cc | 2 +-
samples/wip/viewer/main.cc | 4 ++--
samples/wip/voxels/Voxels.cc | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/extern/glow b/extern/glow
index 736bc4f..586b7ab 160000
--- a/extern/glow
+++ b/extern/glow
@@ -1 +1 @@
-Subproject commit 736bc4f33bddaae68eeb5d541431079b4fa79693
+Subproject commit 586b7ab6bd43921de52605e99c21ce43d39a98dd
diff --git a/extern/glow-extras b/extern/glow-extras
index 8ace274..a821ee7 160000
--- a/extern/glow-extras
+++ b/extern/glow-extras
@@ -1 +1 @@
-Subproject commit 8ace27475742d788c6fdb210b1164f3a3c83e6b7
+Subproject commit a821ee75e99e1303060aed3048732b35e01adab4
diff --git a/extern/polymesh b/extern/polymesh
index 9cea0cc..feb3d89 160000
--- a/extern/polymesh
+++ b/extern/polymesh
@@ -1 +1 @@
-Subproject commit 9cea0cc102096f2cc4a715b2db406803be41d3f6
+Subproject commit feb3d897362c7985cc74f170f0411bfda1bc5366
diff --git a/extern/typed-geometry b/extern/typed-geometry
index 93b0bed..9849f4f 160000
--- a/extern/typed-geometry
+++ b/extern/typed-geometry
@@ -1 +1 @@
-Subproject commit 93b0bedbac60264a539c5d116c60769baeeb4638
+Subproject commit 9849f4f05262ca94a55a3027ea04d5e38f62d542
diff --git a/samples/wip/vector-2D/Vector2DSample.cc b/samples/wip/vector-2D/Vector2DSample.cc
index 12d4e72..0c62fed 100644
--- a/samples/wip/vector-2D/Vector2DSample.cc
+++ b/samples/wip/vector-2D/Vector2DSample.cc
@@ -112,7 +112,7 @@ void Vector2DSample::render(float elapsedSeconds)
g.draw(tg::sphere2({x, y}, 15.f), {{0, 0, 0}, 2});
next();
- g.fill(tg::circle2({x, y}, 15.f), {0, 0, 1});
+ g.fill(tg::disk2({x, y}, 15.f), {0, 0, 1});
g.draw(tg::circle2({x, y}, 15.f), {{0, 0, 0}, 2});
next();
diff --git a/samples/wip/viewer/main.cc b/samples/wip/viewer/main.cc
index 201650b..6ba3217 100644
--- a/samples/wip/viewer/main.cc
+++ b/samples/wip/viewer/main.cc
@@ -138,7 +138,7 @@ int main()
{
glow::vector::image2D img;
auto g = graphics(img);
- g.fill(tg::circle2({100, 100}, 70), tg::color3::red);
+ g.fill(tg::disk2({100, 100}, 70), tg::color3::red);
g.draw(tg::circle2({100, 100}, 70), {tg::color3::black, 2});
view(img);
}
@@ -264,7 +264,7 @@ int main()
auto e1 = cross(e0, uniform_vec(rng, tg::sphere3::unit));
auto e2 = cross(e1, e0);
- auto c = uniform(rng, tg::ball3::unit);
+ auto c = uniform(rng, tg::sphere3::unit);
e0 = normalize(e0) * uniform(rng, 0.2f, 0.5f);
e1 = normalize(e1) * uniform(rng, 0.2f, 0.5f);
diff --git a/samples/wip/voxels/Voxels.cc b/samples/wip/voxels/Voxels.cc
index 07fde5b..994b504 100644
--- a/samples/wip/voxels/Voxels.cc
+++ b/samples/wip/voxels/Voxels.cc
@@ -1,6 +1,6 @@
#include "Voxels.hh"
-#include <typed-geometry/common/assert.hh>
+#include <typed-geometry/feature/assert.hh>
#include <array>
#include <utility>
--
GitLab