godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-03 14:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanup of MultiWindow

Browse Source 
Fixes a glitch on OSX where the root window would swap twice, causing a
glitch.

Change-Id: I5886105fb18ed8f45e69cd10b5d1cac49b82093f
Reviewed-on: https://chromium-review.googlesource.com/320291
Tryjob-Request: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2016-01-04 09:09:21 -05:00
parent 539146e1b6
commit 200205840c
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
samples/multi_window/MultiWindow.cpp
View File

@@ -24,7 +24,7 @@ class MultiWindowSample : public SampleApplication
{
}
virtual bool initialize()
bool initialize() override
{
const std::string vs = SHADER_SOURCE
(
@@ -82,44 +82,44 @@ class MultiWindowSample : public SampleApplication
mWindows.push_back(window);
}
for (size_t i = 1; i < mWindows.size(); i++)
int baseX = rootWindow.osWindow->getX();
int baseY = rootWindow.osWindow->getY();
for (auto &window : mWindows)
{
int x = rootWindow.osWindow->getX() + static_cast<int>(RandomBetween(0, 512));
int y = rootWindow.osWindow->getY() + static_cast<int>(RandomBetween(0, 512));
int x = baseX + static_cast<int>(RandomBetween(0, 512));
int y = baseY + static_cast<int>(RandomBetween(0, 512));
int width = static_cast<int>(RandomBetween(128, 512));
int height = static_cast<int>(RandomBetween(128, 512));
mWindows[i].osWindow->setPosition(x, y);
mWindows[i].osWindow->resize(width, height);
window.osWindow->setPosition(x, y);
window.osWindow->resize(width, height);
}
return true;
}
virtual void destroy()
{
glDeleteProgram(mProgram);
}
void destroy() override { glDeleteProgram(mProgram); }
virtual void step(float dt, double totalTime)
void step(float dt, double totalTime) override
{
mRotation = fmod(mRotation + (dt * 40.0f), 360.0f);
for (size_t i = 1; i < mWindows.size(); i++)
for (auto &window : mWindows)
{
mWindows[i].osWindow->messageLoop();
window.osWindow->messageLoop();
}
}
virtual void draw()
void draw() override
{
OSWindow* rootWindow = mWindows[0].osWindow;
int left = rootWindow->getX();
int right = rootWindow->getX() + rootWindow->getWidth();
int top = rootWindow->getY();
int bottom = rootWindow->getY() + rootWindow->getHeight();
for (size_t i = 1; i < mWindows.size(); i++)
for (auto &windowRecord : mWindows)
{
OSWindow* window = mWindows[i].osWindow;
OSWindow *window = windowRecord.osWindow;
left = std::min(left, window->getX());
right = std::max(right, window->getX() + window->getWidth());
top = std::min(top, window->getY());
@@ -134,10 +134,10 @@ class MultiWindowSample : public SampleApplication
Matrix4::translate(Vector3(-midX, -midY, 0.0f));
Matrix4 viewMatrix = Matrix4::identity();
for (size_t i = 0; i < mWindows.size(); i++)
for (auto &windowRecord : mWindows)
{
OSWindow* window = mWindows[i].osWindow;
EGLSurface surface = mWindows[i].surface;
OSWindow *window = windowRecord.osWindow;
EGLSurface surface = windowRecord.surface;
eglMakeCurrent(getDisplay(), surface, surface, getContext());
@@ -172,6 +172,11 @@ class MultiWindowSample : public SampleApplication
}
}
// Override swap to do nothing as we already swapped the root
// window in draw() and swapping another time would invalidate
// the content of the default framebuffer.
void swap() override {}
private:
// Handle to a program object
GLuint mProgram;