eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 01:19:19 +02:00
Code Issues 123 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();

2
launcher/launchermode.h
View File

@@ -41,5 +41,5 @@ public:
void
on_event_poll() override { ; }
bool
is_command_processor() override { return false; }
is_command_processor() const override { return false; }
};

6
launcher/scenery_list.cpp
View File

@@ -2,7 +2,7 @@
#include "scenery_list.h"
#include "imgui/imgui.h"
#include "utilities.h"
#include "opengl33renderer.h"
#include "renderer.h"
#include "McZapkie/MOVER.h"
#include "application.h"
#include "Logs.h"
@@ -76,12 +76,12 @@ void ui::scenerylist_panel::draw_scenery_image()
{
if (!selected_scenery->image_path.empty()) {
scenery_desc *desc = const_cast<scenery_desc*>(selected_scenery);
desc->image = GfxRenderer.Fetch_Texture(selected_scenery->image_path, true);
desc->image = GfxRenderer->Fetch_Texture(selected_scenery->image_path, true);
desc->image_path.clear();
}
if (selected_scenery->image != null_handle) {
opengl_texture &tex = GfxRenderer.Texture(selected_scenery->image);
opengl_texture &tex = GfxRenderer->Texture(selected_scenery->image);
tex.create();
if (tex.is_ready) {

2
launcher/vehicle_picker.cpp
View File

@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "launcher/vehicle_picker.h"
#include "opengl33renderer.h"
#include "renderer.h"
ui::vehiclepicker_panel::vehiclepicker_panel()
: ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other")