Various clang compilation issues
This commit is contained in:
parent
e9dbc71f87
commit
07924aa0d5
5 changed files with 9 additions and 9 deletions
|
|
@ -429,7 +429,7 @@ struct controller
|
||||||
// static constexpr std::size_t layer2 = 4;
|
// static constexpr std::size_t layer2 = 4;
|
||||||
// static constexpr std::size_t layer3 = outputs;
|
// static constexpr std::size_t layer3 = outputs;
|
||||||
|
|
||||||
static constexpr std::size_t param_count = (inputs + 1) * outputs;
|
//static constexpr std::size_t param_count = (inputs + 1) * outputs;
|
||||||
|
|
||||||
static constexpr float max_output = 20.f;
|
static constexpr float max_output = 20.f;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -183,15 +183,15 @@ struct physics_2d_app
|
||||||
(void)task;
|
(void)task;
|
||||||
// task();
|
// task();
|
||||||
|
|
||||||
// loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{1}, [this]{
|
// loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{1}, [this]{
|
||||||
// physics.add_object(ball_group, ball_shape, material, {simulation_box.corner(0.5f, 0.9f), 0.f}, {});
|
// physics.add_object(ball_group, ball_shape, material, {simulation_box.corner(0.5f, 0.9f), 0.f}, {});
|
||||||
// });
|
// });
|
||||||
|
|
||||||
loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{1}, [this]{
|
loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{1}, [this]{
|
||||||
physics.explode(simulation_box.corner(0.5f, -0.2f), 1000.f, 100.f);
|
physics.explode(simulation_box.corner(0.5f, -0.2f), 1000.f, 100.f);
|
||||||
});
|
});
|
||||||
|
|
||||||
// loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{5}, [this]{
|
// loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{5}, [this]{
|
||||||
// stop();
|
// stop();
|
||||||
// });
|
// });
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ namespace psemek::geom
|
||||||
{
|
{
|
||||||
static_assert(sizeof...(Ts) == N);
|
static_assert(sizeof...(Ts) == N);
|
||||||
|
|
||||||
T w[N] = {ts...};
|
T w[N] = {static_cast<T>(ts)...};
|
||||||
point_type res;
|
point_type res;
|
||||||
for (std::size_t i = 0; i < N; ++i)
|
for (std::size_t i = 0; i < N; ++i)
|
||||||
res[i] = lerp(axes[i], w[i]);
|
res[i] = lerp(axes[i], w[i]);
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace psemek::gfx
|
namespace psemek::gfx
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,9 @@ namespace psemek::util
|
||||||
: std::istream
|
: std::istream
|
||||||
{
|
{
|
||||||
memory_istream(std::string_view data)
|
memory_istream(std::string_view data)
|
||||||
: b_(data)
|
: std::istream(&b_)
|
||||||
{
|
, b_(data)
|
||||||
rdbuf(&b_);
|
{}
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct buf
|
struct buf
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue