diff options
| -rw-r--r-- | atlas.cpp | 2 | ||||
| m--------- | corrade | 0 | ||||
| -rw-r--r-- | crop-tool/crop-tool.cpp | 16 | ||||
| m--------- | magnum | 0 | ||||
| m--------- | magnum-integration | 0 | ||||
| m--------- | magnum-plugins | 0 | ||||
| -rw-r--r-- | main.cpp | 24 |
7 files changed, 21 insertions, 21 deletions
@@ -15,7 +15,7 @@ atlas_texture::atlas_texture(const ImageView2D& image, Vector2i dims) : CORRADE_INTERNAL_ASSERT(size_ % dims_ == Vector2i{}); CORRADE_INTERNAL_ASSERT(dims.product() < 256); tex_.setWrapping(GL::SamplerWrapping::ClampToEdge) - .setMagnificationFilter(GL::SamplerFilter::Linear) + .setMagnificationFilter(GL::SamplerFilter::Nearest) .setMinificationFilter(GL::SamplerFilter::Linear) .setMaxAnisotropy(0) .setStorage(1, GL::textureFormat(image.format()), image.size()) diff --git a/corrade b/corrade -Subproject e616d628dbb3e6f68f530be89ff06d7b3cfa137 +Subproject f2f90fd117d5b7a2373cb37f730461faec6e8e0 diff --git a/crop-tool/crop-tool.cpp b/crop-tool/crop-tool.cpp index c0bf9265..adb2772c 100644 --- a/crop-tool/crop-tool.cpp +++ b/crop-tool/crop-tool.cpp @@ -265,16 +265,16 @@ int main(int argc, char** argv) return usage(args); } - for (anim_atlas atlas; - anim_group& group : anim_info.groups) - { + anim_atlas atlas; + + for (anim_group& group : anim_info.groups) if (!load_directory(group, opts, atlas, opts.input_dir/group.name)) return EX_DATAERR; - if (!atlas.dump(opts.output_dir/(anim_info.name + ".png"))) - return EX_CANTCREAT; - if (!anim_info.to_json(opts.output_dir/(anim_info.name + ".json"))) - return EX_CANTCREAT; - } + + if (!atlas.dump(opts.output_dir/(anim_info.name + ".png"))) + return EX_CANTCREAT; + if (!anim_info.to_json(opts.output_dir/(anim_info.name + ".json"))) + return EX_CANTCREAT; return 0; } diff --git a/magnum b/magnum -Subproject b6739751d2ab957bfc171177bb60d87ed4deb06 +Subproject f3965ddf7e52476144a1cf4c8aed3bc44233aa1 diff --git a/magnum-integration b/magnum-integration -Subproject 6fa1a7754bf8bc612befdc9ec543f8420a0111c +Subproject 79747545dbe711055f7f06bcf6ac5c76541ab6c diff --git a/magnum-plugins b/magnum-plugins -Subproject d8b016d033944175f3530a369506debe51eebd4 +Subproject 98a5c44dddc223e494380cd9c2f017c9e850c94 @@ -72,7 +72,7 @@ application::application(const Arguments& arguments): .setTitle("Test") .setSize({1024, 768}, dpi_policy::Physical), GLConfiguration{} - //.setSampleCount(16) + //.setSampleCount(4) } { struct QuadVertex { @@ -201,18 +201,17 @@ void application::do_key(KeyEvent::Key k, KeyEvent::Modifiers m, bool pressed, b (void)m; (void)repeated; - key x = key::MAX; + const key x = progn(switch (k) { + using enum KeyEvent::Key; + using enum key; - switch (k) - { - using enum KeyEvent::Key; - case W: x = key::camera_up; break; - case A: x = key::camera_left; break; - case S: x = key::camera_down; break; - case D: x = key::camera_right; break; - case Home: x = key::camera_reset; break; - default: (void)0; break; - } + case W: return camera_up; + case A: return camera_left; + case S: return camera_down; + case D: return camera_right; + case Home: return camera_reset; + default: return MAX; + }); if (x != key::MAX) keys[(std::size_t)x] = pressed; @@ -230,6 +229,7 @@ application::~application() { loader_::destroy(); } + void application::keyPressEvent(Platform::Sdl2Application::KeyEvent& event) { do_key(event.key(), event.modifiers(), true, event.isRepeated()); |