summaryrefslogtreecommitdiff
path: root/c2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'c2.cpp')
-rw-r--r--c2.cpp37
1 files changed, 20 insertions, 17 deletions
diff --git a/c2.cpp b/c2.cpp
index be27f60..db9239b 100644
--- a/c2.cpp
+++ b/c2.cpp
@@ -752,6 +752,23 @@ struct C2 : public App {
transf.mat = m4f::identity();
rbf.init(floor_col, v3f(0.0f), quat::identity(), 0.0f);
}
+ world->get<Transform>(monkey).mat = m4f::translate(
+ m4f::identity(),
+ v3f(0.0f, 0.0f, 0.0f)
+ );
+ world->get<Transform>(monkey2).mat = m4f::translate(
+ m4f::identity(),
+ v3f(2.0f, 0.0f, 2.0f)
+ ) * m4f::rotate(
+ m4f::identity(),
+ 0.5f,
+ v3f(1.0f, 0.0f, 0.0f)
+ );
+ {
+ auto& es = editor_settings();
+ es.debug_physics = true;
+ es.pause_physics = true;
+ }
}
void on_update() override {
@@ -760,6 +777,8 @@ struct C2 : public App {
Arena frame_arena;
init_arena(&frame_arena, per_frame, per_frame_memory_size);
+ editor_update(*this, camera);
+
if (es.pause_physics)
phys_dt = 0.0f;
physics_update(*world, &frame_arena, phys_dt);
@@ -846,22 +865,6 @@ struct C2 : public App {
ctx.debug_pop();
Texture& bb = dev->get_texture(hdr_target);
- world->get<Transform>(monkey).mat = m4f::translate(
- m4f::identity(),
- v3f(0.0f, 0.0f, 0.0f)
- ) * m4f::rotate(
- m4f::identity(),
- rot,
- raxis
- );
- world->get<Transform>(monkey2).mat = m4f::translate(
- m4f::identity(),
- v3f(2.0f, 0.0f, 2.0f)
- ) * m4f::rotate(
- m4f::identity(),
- rot * 2.0f,
- v3f(1.0f, 0.0f, 0.0f)
- );
camera.asp = (float)bb.w / (float)bb.h;
camera.update_orbit(*this);
camera.update();
@@ -958,7 +961,7 @@ struct C2 : public App {
ctx.debug_push("debug");
pb.begin_rp();
pb.rp_target(dev->get_backbuffer(), Clear_Mode::restore);
- pb.rp_depth_target(dev->get_depth_target(), Clear_Mode::restore);
+// pb.rp_depth_target(dev->get_depth_target(), Clear_Mode::restore);
lr.flush(camera, dev, &frame_arena, pb.build_rp());
ctx.debug_pop();