Skip to content

Commit

Permalink
trying to get actions work
Browse files Browse the repository at this point in the history
  • Loading branch information
platonvin committed Aug 30, 2024
1 parent 690425d commit ae4f999
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ else
endif

# all of them united
always_enabled_flags = -fno-exceptions -Wuninitialized -std=c++20
always_enabled_flags = -fno-exceptions -Wuninitialized -std=c++20 -Wno-inconsistent-missing-destructor-override
debug_specific_flags = -O0 -g
release_specific_flags = -Ofast -DVKNDEBUG -mmmx -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -mcx16 -mavx -mpclmul -fdata-sections -ffunction-sections -s -mfancy-math-387 -fno-math-errno -Wl,--gc-sections
release_flags = $(release_specific_flags) $(always_enabled_flags)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int main() {


if (engine.render.measureAll){
printf("%-22s: %7.3f: %7.3f\n", engine.render.timestampNames[0], 0.0);
printf("%-22s: %7.3f: %7.3f\n", engine.render.timestampNames[0], 0.0, 0.0);

// float timestampPeriod = engine.render.physicalDeviceProperties.limits.timestampPeriod;
for (int i=1; i<engine.render.currentTimestamp; i++){
Expand Down
24 changes: 12 additions & 12 deletions src/renderer/render.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -752,49 +752,49 @@ class MyRenderInterface : public Rml::RenderInterface {
public:
MyRenderInterface() {}

~MyRenderInterface() override {}
~MyRenderInterface() {}; //override
// Called by RmlUi when it wants to render geometry that the application does not wish to optimise
void RenderGeometry (Rml::Vertex* vertices,
int num_vertices,
int* indices,
int num_indices,
Rml::TextureHandle texture,
const Rml::Vector2f& translation) override;
const Rml::Vector2f& translation); //override;

// Called by RmlUi when it wants to compile geometry it believes will be static for the forseeable future.
Rml::CompiledGeometryHandle CompileGeometry (Rml::Vertex* vertices, int num_vertices, int* indices, int num_indices, Rml::TextureHandle texture) override;
Rml::CompiledGeometryHandle CompileGeometry (Rml::Vertex* vertices, int num_vertices, int* indices, int num_indices, Rml::TextureHandle texture); //override;

// Called by RmlUi when it wants to render application-compiled geometry.
void RenderCompiledGeometry (Rml::CompiledGeometryHandle geometry, const Rml::Vector2f& translation) override;
void RenderCompiledGeometry (Rml::CompiledGeometryHandle geometry, const Rml::Vector2f& translation); //override;

// Called by RmlUi when it wants to release application-compiled geometry.
void ReleaseCompiledGeometry (Rml::CompiledGeometryHandle geometry) override;
void ReleaseCompiledGeometry (Rml::CompiledGeometryHandle geometry); //override;

// Called by RmlUi when it wants to enable or disable scissoring to clip content.
void EnableScissorRegion (bool enable) override;
void EnableScissorRegion (bool enable); //override;

// Called by RmlUi when it wants to change the scissor region.
void SetScissorRegion (int x, int y, int width, int height) override;
void SetScissorRegion (int x, int y, int width, int height); //override;

// Called by RmlUi when a texture is required by the library.
bool LoadTexture (Rml::TextureHandle& texture_handle,
Rml::Vector2i& texture_dimensions,
const Rml::String& source) override;
const Rml::String& source); //override;

// Called by RmlUi when a texture is required to be built from an internally-generated sequence of pixels.
bool GenerateTexture (Rml::TextureHandle& texture_handle,
const Rml::byte* source,
const Rml::Vector2i& source_dimensions) override;
const Rml::Vector2i& source_dimensions); //override;

// Called by RmlUi when a loaded texture is no longer required.
void ReleaseTexture (Rml::TextureHandle texture_handle) override;
void ReleaseTexture (Rml::TextureHandle texture_handle); //override;

// Called by RmlUi when it wants the renderer to use a new transform matrix.
// If no transform applies to the current element, nullptr is submitted. Then it expects the renderer to use
// an glm::identity matrix or otherwise omit the multiplication with the transform.
void SetTransform (const Rml::Matrix4f* transform) override;
void SetTransform (const Rml::Matrix4f* transform); //override;

// Rml::Context* GetContext() override {};
// Rml::Context* GetContext(); //override {};
Renderer* render;
Image* default_image = NULL;

Expand Down

0 comments on commit ae4f999

Please sign in to comment.