LibraryViewer
This commit is contained in:
IlyaShurupov
Ilya Shurupov
parent
f6ba86aff8
commit
dd71eba0ec
24 changed files with 226111 additions and 36 deletions
|
|
@ -19,7 +19,9 @@ halnf AnimValue::interpolate() const {
|
|||
return out;
|
||||
}
|
||||
|
||||
AnimValue::AnimValue() = default;
|
||||
AnimValue::AnimValue() {
|
||||
mTimeStart = gCurrentTime;
|
||||
}
|
||||
|
||||
void AnimValue::setAnimTime(halni time) { mTimeAnim = time; }
|
||||
|
||||
|
|
@ -39,7 +41,9 @@ void AnimValue::set(halnf val) {
|
|||
if (val == mVal) return;
|
||||
mValPrev = get();
|
||||
mVal = val;
|
||||
if (!inTransition()) mTimeStart = (halni) gCurrentTime;
|
||||
if (!inTransition()) {
|
||||
mTimeStart = gCurrentTime;
|
||||
}
|
||||
}
|
||||
|
||||
halnf AnimValue::getTarget() const { return mVal; }
|
||||
|
|
@ -47,14 +51,19 @@ halnf AnimValue::getTarget() const { return mVal; }
|
|||
void AnimValue::setNoTransition(halnf val) {
|
||||
mValPrev = val;
|
||||
mVal = val;
|
||||
mTimeStart -= mTimeStart;
|
||||
mTimeStart = gCurrentTime - mTimeAnim;
|
||||
}
|
||||
|
||||
halnf AnimValue::get() const {
|
||||
if (inTransition()) {
|
||||
gInTransition = true;
|
||||
return interpolate();
|
||||
}
|
||||
return interpolate();
|
||||
return mVal;
|
||||
}
|
||||
|
||||
void AnimValue::operator=(halnf val) {
|
||||
setNoTransition(val);
|
||||
}
|
||||
|
||||
AnimValue::operator halnf() const { return get(); }
|
||||
|
|
@ -84,6 +93,8 @@ void AnimRect::set(const RectF& in) {
|
|||
w.set(in.w);
|
||||
}
|
||||
|
||||
AnimColor::AnimColor() : mColor() {}
|
||||
|
||||
RGBA AnimColor::get() const {
|
||||
auto col = mColor.get();
|
||||
return { col.x, col.y, col.z, col.w };
|
||||
|
|
|
|||
|
|
@ -23,31 +23,78 @@ Graphics::Canvas::Canvas() { mContext = new Context(); }
|
|||
|
||||
Graphics::Canvas::~Canvas() { delete mContext; }
|
||||
|
||||
void Graphics::Canvas::init() { mContext->vg = nvgCreateGL3(NVG_ANTIALIAS | NVG_STENCIL_STROKES); }
|
||||
void Graphics::Canvas::init() {
|
||||
mContext->vg = nvgCreateGL3(NVG_ANTIALIAS | NVG_STENCIL_STROKES);
|
||||
|
||||
if (nvgCreateFont(mContext->vg, "default", "Font.ttf") == -1) {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
|
||||
void Graphics::Canvas::deinit() {
|
||||
// Cleanup
|
||||
nvgDeleteGL3(mContext->vg);
|
||||
}
|
||||
|
||||
void Graphics::Canvas::proc() {
|
||||
auto width = 600;
|
||||
auto height = 600;
|
||||
RectF Graphics::Canvas::getAvaliableArea() {
|
||||
return { (halnf) 0, (halnf) 0, mWidth, mHeight };
|
||||
}
|
||||
|
||||
// Start NanoVG rendering
|
||||
nvgBeginFrame(mContext->vg, width, height, 1.0);
|
||||
|
||||
// Draw a rectangle
|
||||
void Graphics::Canvas::rect(const RectF& rec, const RGBA& col, halnf round) {
|
||||
nvgBeginPath(mContext->vg);
|
||||
nvgRect(mContext->vg, 50, 50, 50, 50);
|
||||
nvgFillColor(mContext->vg, nvgRGBf(0.8f, 0.4f, 0.1f));
|
||||
nvgFill(mContext->vg);
|
||||
|
||||
if (round == 0) {
|
||||
nvgRect(mContext->vg, rec.x, rec.y, rec.z, rec.w);
|
||||
} else {
|
||||
nvgRoundedRect(mContext->vg, rec.x, rec.y, rec.z, rec.w, round);
|
||||
}
|
||||
|
||||
// End NanoVG rendering
|
||||
nvgEndFrame(mContext->vg);
|
||||
nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a });
|
||||
nvgFill(mContext->vg);
|
||||
}
|
||||
|
||||
void Graphics::Canvas::text(const String& string, const RectF& aRec, halnf size, Align align, halnf marging, const RGBA& col) {
|
||||
RectF rec = { aRec.x + marging, aRec.y + marging, aRec.z - marging * 2, aRec.w - marging * 2 };
|
||||
|
||||
nvgScissor(mContext->vg, rec.x, rec.y, rec.z, rec.w);
|
||||
|
||||
nvgFontSize(mContext->vg, size);
|
||||
nvgFontFace(mContext->vg, "default");
|
||||
nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a } );
|
||||
|
||||
float centerX = rec.x;
|
||||
float centerY = rec.y;
|
||||
int alignNVG = 0;
|
||||
|
||||
if (((int1*)&align)[1] == 0x00) { // center x
|
||||
alignNVG |= NVG_ALIGN_CENTER;
|
||||
centerX += rec.z * 0.5f;
|
||||
} else if (((int1*)&align)[1] == 0x01) { // left x
|
||||
alignNVG |= NVG_ALIGN_LEFT;
|
||||
} else if (((int1*)&align)[1] == 0x02) { // right x
|
||||
alignNVG |= NVG_ALIGN_RIGHT;
|
||||
centerX += rec.z;
|
||||
}
|
||||
|
||||
if (((int1*)&align)[0] == 0x00) { // center y
|
||||
alignNVG |= NVG_ALIGN_MIDDLE;
|
||||
centerY += rec.w * 0.5f;
|
||||
} else if (((int1*)&align)[0] == 0x01) { // top y
|
||||
alignNVG |= NVG_ALIGN_TOP;
|
||||
centerY += rec.w;
|
||||
} else if (((int1*)&align)[0] == 0x02) { // bottom y
|
||||
alignNVG |= NVG_ALIGN_BOTTOM;
|
||||
}
|
||||
|
||||
nvgTextAlign(mContext->vg, alignNVG);
|
||||
|
||||
nvgText(mContext->vg, centerX, centerY, string.read(), nullptr);
|
||||
nvgResetScissor(mContext->vg);
|
||||
}
|
||||
|
||||
void Graphics::Canvas::proc() {
|
||||
nvgBeginFrame(mContext->vg, mWidth, mHeight, 1.0);
|
||||
}
|
||||
|
||||
void Graphics::Canvas::draw() {
|
||||
// End NanoVG rendering
|
||||
nvgEndFrame(mContext->vg);
|
||||
}
|
||||
|
|
@ -47,37 +47,45 @@ void Graphics::GL::deinit() {
|
|||
glDeleteVertexArrays(1, &mContext->vao);
|
||||
}
|
||||
|
||||
void Graphics::GL::proc() { glClear(GL_COLOR_BUFFER_BIT); }
|
||||
void Graphics::GL::proc() {
|
||||
}
|
||||
|
||||
void Graphics::GL::draw() { glDrawArrays(GL_TRIANGLES, 0, 3); }
|
||||
void Graphics::GL::draw() {
|
||||
glClearColor(0.f, 0.f, 0.f, 0.f);
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
||||
glViewport(0, 0, mWidth, mHeight);
|
||||
// glDrawArrays(GL_TRIANGLES, 0, 3);
|
||||
}
|
||||
|
||||
void Graphics::init(Window* window) {
|
||||
mGl.init();
|
||||
mGui.init(window);
|
||||
//mGui.init(window);
|
||||
mCanvas.init();
|
||||
}
|
||||
|
||||
void Graphics::deinit() {
|
||||
mCanvas.deinit();
|
||||
mGui.deinit();
|
||||
// mGui.deinit();
|
||||
mGl.deinit();
|
||||
}
|
||||
|
||||
void Graphics::proc() {
|
||||
mGl.proc();
|
||||
mCanvas.proc();
|
||||
mGui.proc();
|
||||
// mGui.proc();
|
||||
}
|
||||
|
||||
void Graphics::draw() {
|
||||
mGl.draw();
|
||||
mCanvas.draw();
|
||||
mGui.draw();
|
||||
// mGui.draw();
|
||||
}
|
||||
|
||||
Window::Window(int width, int height, const char* title) {
|
||||
mContext = new Context();
|
||||
|
||||
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
|
||||
|
||||
// Create a window and OpenGL context
|
||||
mContext->window = glfwCreateWindow(width, height, title, nullptr, nullptr);
|
||||
if (!mContext->window) {
|
||||
|
|
@ -94,6 +102,11 @@ Window::Window(int width, int height, const char* title) {
|
|||
}
|
||||
|
||||
mGraphics.init(this);
|
||||
|
||||
mContext->inputManager.init(mContext->window);
|
||||
glfwSetWindowUserPointer(mContext->window, &mContext->inputManager);
|
||||
|
||||
mEvents.mContext = mContext;
|
||||
}
|
||||
|
||||
Window::~Window() {
|
||||
|
|
@ -136,12 +149,44 @@ bool Window::shouldClose() const { return glfwWindowShouldClose(mContext->window
|
|||
|
||||
void Window::processEvents() {
|
||||
glfwPollEvents();
|
||||
|
||||
int w, h;
|
||||
glfwGetWindowSize(mContext->window, &w, &h);
|
||||
|
||||
mGraphics.mCanvas.mWidth = w;
|
||||
mGraphics.mCanvas.mHeight = h;
|
||||
|
||||
mGraphics.mGl.mWidth = w;
|
||||
mGraphics.mGl.mHeight = h;
|
||||
|
||||
mGraphics.proc();
|
||||
|
||||
mContext->inputManager.update();
|
||||
get_time();
|
||||
}
|
||||
|
||||
void Window::draw() {
|
||||
mGraphics.draw();
|
||||
glfwSwapBuffers(mContext->window);
|
||||
mContext->inputManager.resetScroll();
|
||||
}
|
||||
|
||||
auto Window::getContext() -> Context* { return mContext; }
|
||||
auto Window::getContext() -> Context* { return mContext; }
|
||||
Graphics::Canvas& Window::getCanvas() { return mGraphics.mCanvas; }
|
||||
const Window::Events& Window::getEvents() { return mEvents; }
|
||||
|
||||
const Vec2F& Window::Events::getPos() const {
|
||||
return mContext->inputManager.getPos();
|
||||
}
|
||||
|
||||
bool Window::Events::isPressed() const {
|
||||
return mContext->inputManager.isPressed();
|
||||
}
|
||||
|
||||
bool Window::Events::isDown() const {
|
||||
return mContext->inputManager.isDown();
|
||||
}
|
||||
|
||||
halnf Window::Events::getScrollY() const {
|
||||
return mContext->inputManager.getScrollY();
|
||||
}
|
||||
|
|
@ -2,10 +2,100 @@
|
|||
|
||||
// -------- Window Context -------- //
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <array>
|
||||
|
||||
namespace tp {
|
||||
|
||||
class Window;
|
||||
|
||||
class InputManager {
|
||||
public:
|
||||
InputManager() = default;
|
||||
|
||||
void init(GLFWwindow* aWindow) {
|
||||
window = aWindow;
|
||||
// Set up key and mouse button callbacks
|
||||
glfwSetKeyCallback(window, keyCallback);
|
||||
glfwSetMouseButtonCallback(window, mouseButtonCallback);
|
||||
glfwSetScrollCallback(window, scrollCallback);
|
||||
}
|
||||
|
||||
const Vec2F& getPos() const { return mousePos; }
|
||||
|
||||
bool isKeyPressed(int key) const {
|
||||
return keyStates[key] == GLFW_PRESS;
|
||||
}
|
||||
|
||||
bool isKeyDown(int key) const {
|
||||
return keyStates[key] == GLFW_REPEAT || keyStates[key] == GLFW_PRESS;
|
||||
}
|
||||
|
||||
bool isPressed() const {
|
||||
return mouseButtonStates[GLFW_MOUSE_BUTTON_LEFT] == GLFW_PRESS;
|
||||
}
|
||||
|
||||
bool isDown() const {
|
||||
return mouseButtonStates[GLFW_MOUSE_BUTTON_LEFT] == GLFW_REPEAT || mouseButtonStates[GLFW_MOUSE_BUTTON_LEFT] == GLFW_PRESS;
|
||||
}
|
||||
|
||||
double getScrollY() const { return scrollY; }
|
||||
|
||||
// bool isScrollDown() const { return scrollY < 0.0; }
|
||||
|
||||
private:
|
||||
friend Window;
|
||||
|
||||
static void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) {
|
||||
InputManager* inputManager = static_cast<InputManager*>(glfwGetWindowUserPointer(window));
|
||||
|
||||
if (!inputManager) {
|
||||
// Update key state
|
||||
if (action == GLFW_PRESS) {
|
||||
inputManager->keyStates[key] = GLFW_PRESS;
|
||||
} else if (action == GLFW_RELEASE) {
|
||||
inputManager->keyStates[key] = GLFW_RELEASE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods) {
|
||||
InputManager* inputManager = static_cast<InputManager*>(glfwGetWindowUserPointer(window));
|
||||
|
||||
if (inputManager) {
|
||||
// Update mouse button state
|
||||
inputManager->mouseButtonStates[button] = action;
|
||||
}
|
||||
}
|
||||
|
||||
static void scrollCallback(GLFWwindow* window, double xoffset, double yoffset) {
|
||||
InputManager* inputManager = static_cast<InputManager*>(glfwGetWindowUserPointer(window));
|
||||
|
||||
if (inputManager) {
|
||||
// Update scroll state
|
||||
inputManager->scrollX = xoffset;
|
||||
inputManager->scrollY = yoffset;
|
||||
}
|
||||
}
|
||||
|
||||
void update() {
|
||||
double x, y;
|
||||
glfwGetCursorPos(window, &x, &y);
|
||||
mousePos = { x, y };
|
||||
}
|
||||
|
||||
void resetScroll() {
|
||||
scrollX = 0.0;
|
||||
scrollY = 0.0;
|
||||
}
|
||||
|
||||
double scrollX = 0.0;
|
||||
double scrollY = 0.0;
|
||||
GLFWwindow* window;
|
||||
Vec2F mousePos;
|
||||
std::array<int, GLFW_KEY_LAST + 1> keyStates = { GLFW_RELEASE };
|
||||
std::array<int, GLFW_MOUSE_BUTTON_LAST + 1> mouseButtonStates = { GLFW_RELEASE };
|
||||
};
|
||||
|
||||
class Window::Context {
|
||||
friend Graphics::GL;
|
||||
friend Graphics::GUI;
|
||||
|
|
@ -13,5 +103,6 @@ namespace tp {
|
|||
|
||||
public:
|
||||
GLFWwindow* window;
|
||||
InputManager inputManager;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue