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

Refactor test shader style.

Browse Source 
This change enforces a lot more consistency. We pass const char * to
the Compile functions instead of std::string. Also fixes the
indentation of C++11 block comments to be more consistent.

Bug: angleproject:2995
Change-Id: Id6e5ea94055d8cbd420df4ea2e81b2d96cb5ce78
Reviewed-on: https://chromium-review.googlesource.com/c/1357103
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Jamie Madill
2018-12-02 12:03:33 -05:00
committed by Commit Bot
parent 4abdf74f0a
commit 35cd7332ab
112 changed files with 4345 additions and 4813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
samples/multi_window/MultiWindow.cpp
View File

@@ -6,13 +6,13 @@
#include "SampleApplication.h"
#include <cmath>
#include <algorithm>
#include <cmath>
#include <vector>
#include "Matrix.h"
#include "random_utils.h"
#include "shader_utils.h"
#include "util/Matrix.h"
#include "util/random_utils.h"
#include "util/shader_utils.h"
using namespace angle;
@@ -21,26 +21,23 @@ class MultiWindowSample : public SampleApplication
public:
MultiWindowSample(int argc, char **argv)
: SampleApplication("MultiWindow", argc, argv, 2, 0, 256, 256)
{
}
{}
bool initialize() override
{
const std::string vs =
R"(attribute vec4 vPosition;
void main()
{
gl_Position = vPosition;
})";
constexpr char kVS[] = R"(attribute vec4 vPosition;
void main()
{
gl_Position = vPosition;
})";
const std::string fs =
R"(precision mediump float;
void main()
{
gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
})";
constexpr char kFS[] = R"(precision mediump float;
void main()
{
gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
})";
mProgram = CompileProgram(vs, fs);
mProgram = CompileProgram(kVS, kFS);
if (!mProgram)
{
return false;
@@ -53,7 +50,7 @@ class MultiWindowSample : public SampleApplication
window rootWindow;
rootWindow.osWindow = getWindow();
rootWindow.surface = getSurface();
rootWindow.surface = getSurface();
mWindows.push_back(rootWindow);
const size_t numWindows = 5;
@@ -67,7 +64,8 @@ class MultiWindowSample : public SampleApplication
return false;
}
window.surface = eglCreateWindowSurface(getDisplay(), getConfig(), window.osWindow->getNativeWindow(), nullptr);
window.surface = eglCreateWindowSurface(getDisplay(), getConfig(),
window.osWindow->getNativeWindow(), nullptr);
if (window.surface == EGL_NO_SURFACE)
{
return false;
@@ -107,19 +105,19 @@ class MultiWindowSample : public SampleApplication
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();
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 (auto &windowRecord : mWindows)
{
OSWindow *window = windowRecord.osWindow;
left = std::min(left, window->getX());
right = std::max(right, window->getX() + window->getWidth());
top = std::min(top, window->getY());
bottom = std::max(bottom, window->getY() + window->getHeight());
left = std::min(left, window->getX());
right = std::max(right, window->getX() + window->getWidth());
top = std::min(top, window->getY());
bottom = std::max(bottom, window->getY() + window->getHeight());
}
float midX = (left + right) * 0.5f;
@@ -137,16 +135,19 @@ class MultiWindowSample : public SampleApplication
eglMakeCurrent(getDisplay(), surface, surface, getContext());
Matrix4 orthoMatrix = Matrix4::ortho(static_cast<float>(window->getX()), static_cast<float>(window->getX() + window->getWidth()),
static_cast<float>(window->getY() + window->getHeight()), static_cast<float>(window->getY()),
0.0f, 1.0f);
Matrix4 orthoMatrix =
Matrix4::ortho(static_cast<float>(window->getX()),
static_cast<float>(window->getX() + window->getWidth()),
static_cast<float>(window->getY() + window->getHeight()),
static_cast<float>(window->getY()), 0.0f, 1.0f);
Matrix4 mvpMatrix = orthoMatrix * viewMatrix * modelMatrix;
Vector3 vertices[] =
{
Vector3 vertices[] = {
Matrix4::transform(mvpMatrix, Vector4(midX, static_cast<float>(top), 0.0f, 1.0f)),
Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(left), static_cast<float>(bottom), 0.0f, 1.0f)),
Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(right), static_cast<float>(bottom), 0.0f, 1.0f)),
Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(left),
static_cast<float>(bottom), 0.0f, 1.0f)),
Matrix4::transform(mvpMatrix, Vector4(static_cast<float>(right),
static_cast<float>(bottom), 0.0f, 1.0f)),
};
// Set the viewport
@@ -183,7 +184,7 @@ class MultiWindowSample : public SampleApplication
// Window and surface data
struct window
{
OSWindow* osWindow;
OSWindow *osWindow;
EGLSurface surface;
};
std::vector<window> mWindows;