eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tmj/master' into sim

Browse Source
This commit is contained in:
milek7
2020-10-18 23:35:14 +02:00
parent 1dc1bd5fcb 4da87e98d9
commit 29f8f91ad8
244 changed files with 54164 additions and 11636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/deferred_image.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "Texture.h"
#include "opengl33renderer.h"
#include "renderer.h"
class deferred_image {
public:
@@ -18,12 +18,12 @@ public:
GLuint get() const
{
if (!path.empty()) {
image = GfxRenderer.Fetch_Texture(path, true);
image = GfxRenderer->Fetch_Texture(path, true);
path.clear();
}
if (image != null_handle) {
opengl_texture &tex = GfxRenderer.Texture(image);
opengl_texture &tex = GfxRenderer->Texture(image);
tex.create();
if (tex.is_ready)
@@ -36,7 +36,7 @@ public:
glm::ivec2 size() const
{
if (image != null_handle) {
opengl_texture &tex = GfxRenderer.Texture(image);
opengl_texture &tex = GfxRenderer->Texture(image);
return glm::ivec2(tex.width(), tex.height());
}
return glm::ivec2();