redstrate/prism
Archived
1
Fork 0
Code Activity

Cleanup debug pass warnings

Browse source
This commit is contained in:
Joshua Goins 2022-02-21 00:15:24 -05:00
parent ed8adba8ff
commit e8deaa54c2
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/common/include/debugpass.hpp
View file

@ -17,13 +17,11 @@
class Texture; class Texture;
class Mesh; class Mesh;
using Object = uint64_t;
struct SelectableObject { struct SelectableObject {
enum class Type { enum class Type {
Object, Object,
Handle Handle
} type; } type = Type::Object;
Matrix4x4 axis_model; Matrix4x4 axis_model;
@ -31,16 +29,16 @@ struct SelectableObject {
X, X,
Y, Y,
Z Z
} axis; } axis = Axis::X;
enum class RenderType { enum class RenderType {
Mesh, Mesh,
Sphere Sphere
} render_type; } render_type = RenderType::Mesh;
float sphere_size = 1.0f; float sphere_size = 1.0f;
Object object; prism::Object object = prism::NullObject;
}; };
class DebugPass : public Pass { class DebugPass : public Pass {
@ -51,7 +49,7 @@ public:
void render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) override; void render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) override;
void get_selected_object(int x, int y, std::function<void(SelectableObject)> callback); void get_selected_object(int x, int y, const std::function<void(SelectableObject)>& callback);
void draw_arrow(GFXCommandBuffer* commandBuffer, prism::float3 color, Matrix4x4 model); void draw_arrow(GFXCommandBuffer* commandBuffer, prism::float3 color, Matrix4x4 model);
GFXTexture* get_requested_texture(PassTextureType type) override { GFXTexture* get_requested_texture(PassTextureType type) override {

2
tools/common/src/debugpass.cpp
View file

@ -423,7 +423,7 @@ void DebugPass::render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) {
} }
} }
void DebugPass::get_selected_object(int x, int y, std::function<void(SelectableObject)> callback) { void DebugPass::get_selected_object(int x, int y, const std::function<void(SelectableObject)>& callback) {
if(engine->get_scene() == nullptr) if(engine->get_scene() == nullptr)
return; return;