update Dear ImGui to 1.92.0, part 2
TODO: - testing - testing - testing - additional testing - extra testing and of course: - testing
This commit is contained in:
parent
11ecbebcdc
commit
ee7087b7a5
36 changed files with 245 additions and 741 deletions
|
|
@ -71,20 +71,13 @@ void FurnaceGUIRender::resized(const SDL_Event& ev) {
|
|||
void FurnaceGUIRender::clear(ImVec4 color) {
|
||||
}
|
||||
|
||||
bool FurnaceGUIRender::newFrame() {
|
||||
return true;
|
||||
void FurnaceGUIRender::newFrame() {
|
||||
}
|
||||
|
||||
bool FurnaceGUIRender::canVSync() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void FurnaceGUIRender::createFontsTexture() {
|
||||
}
|
||||
|
||||
void FurnaceGUIRender::destroyFontsTexture() {
|
||||
}
|
||||
|
||||
void FurnaceGUIRender::renderGUI() {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -308,8 +308,8 @@ void FurnaceGUIRenderDX11::clear(ImVec4 color) {
|
|||
context->ClearRenderTargetView(renderTarget,floatColor);
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderDX11::newFrame() {
|
||||
return ImGui_ImplDX11_NewFrame();
|
||||
void FurnaceGUIRenderDX11::newFrame() {
|
||||
ImGui_ImplDX11_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderDX11::canVSync() {
|
||||
|
|
@ -317,14 +317,6 @@ bool FurnaceGUIRenderDX11::canVSync() {
|
|||
return true;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX11::createFontsTexture() {
|
||||
ImGui_ImplDX11_CreateDeviceObjects();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX11::destroyFontsTexture() {
|
||||
ImGui_ImplDX11_InvalidateDeviceObjects();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX11::renderGUI() {
|
||||
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,10 +74,8 @@ class FurnaceGUIRenderDX11: public FurnaceGUIRender {
|
|||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void resized(const SDL_Event& ev);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
|
|
@ -344,22 +344,14 @@ void FurnaceGUIRenderDX9::present() {
|
|||
}
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderDX9::newFrame() {
|
||||
return ImGui_ImplDX9_NewFrame();
|
||||
void FurnaceGUIRenderDX9::newFrame() {
|
||||
ImGui_ImplDX9_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderDX9::canVSync() {
|
||||
return supportsVSync;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX9::createFontsTexture() {
|
||||
ImGui_ImplDX9_CreateDeviceObjects();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX9::destroyFontsTexture() {
|
||||
ImGui_ImplDX9_InvalidateDeviceObjects();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderDX9::renderGUI() {
|
||||
if (!inScene) {
|
||||
HRESULT result=device->BeginScene();
|
||||
|
|
|
|||
|
|
@ -57,11 +57,9 @@ class FurnaceGUIRenderDX9: public FurnaceGUIRender {
|
|||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void resized(const SDL_Event& ev);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
bool areTexturesSquare();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
|
|
@ -382,22 +382,14 @@ void FurnaceGUIRenderGL::clear(ImVec4 color) {
|
|||
C(glClear(GL_COLOR_BUFFER_BIT));
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderGL::newFrame() {
|
||||
return ImGui_ImplOpenGL3_NewFrame();
|
||||
void FurnaceGUIRenderGL::newFrame() {
|
||||
ImGui_ImplOpenGL3_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderGL::canVSync() {
|
||||
return swapIntervalSet;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL::createFontsTexture() {
|
||||
ImGui_ImplOpenGL3_CreateFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL::destroyFontsTexture() {
|
||||
ImGui_ImplOpenGL3_DestroyFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL::renderGUI() {
|
||||
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,10 +65,8 @@ class FurnaceGUIRenderGL: public FurnaceGUIRender {
|
|||
void setTextureBlendMode(FurnaceGUITexture* which, FurnaceGUIBlendMode mode);
|
||||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 pos1, ImVec4 color, ImVec2 canvasSize, float lineWidth);
|
||||
|
|
|
|||
|
|
@ -173,22 +173,14 @@ void FurnaceGUIRenderGL1::clear(ImVec4 color) {
|
|||
C(glClear(GL_COLOR_BUFFER_BIT));
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderGL1::newFrame() {
|
||||
return ImGui_ImplOpenGL2_NewFrame();
|
||||
void FurnaceGUIRenderGL1::newFrame() {
|
||||
ImGui_ImplOpenGL2_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderGL1::canVSync() {
|
||||
return swapIntervalSet;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL1::createFontsTexture() {
|
||||
ImGui_ImplOpenGL2_CreateFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL1::destroyFontsTexture() {
|
||||
ImGui_ImplOpenGL2_DestroyFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderGL1::renderGUI() {
|
||||
ImGui_ImplOpenGL2_RenderDrawData(ImGui::GetDrawData());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,11 +41,9 @@ class FurnaceGUIRenderGL1: public FurnaceGUIRender {
|
|||
void setTextureBlendMode(FurnaceGUITexture* which, FurnaceGUIBlendMode mode);
|
||||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
bool areTexturesSquare();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
|
|
@ -37,10 +37,8 @@ class FurnaceGUIRenderMetal: public FurnaceGUIRender {
|
|||
void setTextureBlendMode(FurnaceGUITexture* which, FurnaceGUIBlendMode mode);
|
||||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
|
|
@ -150,22 +150,14 @@ void FurnaceGUIRenderMetal::clear(ImVec4 color) {
|
|||
priv->renderEncoder=[priv->cmdBuf renderCommandEncoderWithDescriptor:priv->renderPass];
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderMetal::newFrame() {
|
||||
return ImGui_ImplMetal_NewFrame(priv->renderPass);
|
||||
void FurnaceGUIRenderMetal::newFrame() {
|
||||
ImGui_ImplMetal_NewFrame(priv->renderPass);
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderMetal::canVSync() {
|
||||
return swapIntervalSet;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderMetal::createFontsTexture() {
|
||||
ImGui_ImplMetal_CreateFontsTexture(priv->context.device);
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderMetal::destroyFontsTexture() {
|
||||
ImGui_ImplMetal_DestroyFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderMetal::renderGUI() {
|
||||
ImGui_ImplMetal_RenderDrawData(ImGui::GetDrawData(),priv->cmdBuf,priv->renderEncoder);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,22 +120,14 @@ void FurnaceGUIRenderSDL::clear(ImVec4 color) {
|
|||
SDL_RenderClear(sdlRend);
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderSDL::newFrame() {
|
||||
return ImGui_ImplSDLRenderer2_NewFrame();
|
||||
void FurnaceGUIRenderSDL::newFrame() {
|
||||
ImGui_ImplSDLRenderer2_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderSDL::canVSync() {
|
||||
return swapIntervalSet;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSDL::createFontsTexture() {
|
||||
ImGui_ImplSDLRenderer2_CreateFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSDL::destroyFontsTexture() {
|
||||
ImGui_ImplSDLRenderer2_DestroyFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSDL::renderGUI() {
|
||||
ImGui_ImplSDLRenderer2_RenderDrawData(ImGui::GetDrawData(),sdlRend);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,10 +35,8 @@ class FurnaceGUIRenderSDL: public FurnaceGUIRender {
|
|||
void setTextureBlendMode(FurnaceGUITexture* which, FurnaceGUIBlendMode mode);
|
||||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
|
|
@ -105,22 +105,14 @@ void FurnaceGUIRenderSoftware::clear(ImVec4 color) {
|
|||
}
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderSoftware::newFrame() {
|
||||
return ImGui_ImplSW_NewFrame();
|
||||
void FurnaceGUIRenderSoftware::newFrame() {
|
||||
ImGui_ImplSW_NewFrame();
|
||||
}
|
||||
|
||||
bool FurnaceGUIRenderSoftware::canVSync() {
|
||||
return false;
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSoftware::createFontsTexture() {
|
||||
ImGui_ImplSW_CreateFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSoftware::destroyFontsTexture() {
|
||||
ImGui_ImplSW_DestroyFontsTexture();
|
||||
}
|
||||
|
||||
void FurnaceGUIRenderSoftware::renderGUI() {
|
||||
ImGui_ImplSW_RenderDrawData(ImGui::GetDrawData());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,10 +32,8 @@ class FurnaceGUIRenderSoftware: public FurnaceGUIRender {
|
|||
void setTextureBlendMode(FurnaceGUITexture* which, FurnaceGUIBlendMode mode);
|
||||
void setBlendMode(FurnaceGUIBlendMode mode);
|
||||
void clear(ImVec4 color);
|
||||
bool newFrame();
|
||||
void newFrame();
|
||||
bool canVSync();
|
||||
void createFontsTexture();
|
||||
void destroyFontsTexture();
|
||||
void renderGUI();
|
||||
void wipe(float alpha);
|
||||
void present();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue