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

6
vr/openvr_imp.cpp
View File

@@ -2,7 +2,7 @@
#include "openvr_imp.h"
#include "Logs.h"
#include "Globals.h"
#include "opengl33renderer.h"
#include "renderer.h"
vr_openvr::vr_openvr()
{
@@ -171,9 +171,9 @@ component_done:
TSubModel *sm = controllers[i]->pending_textures[t].first;
const vr::TextureID_t texture_id = controllers[i]->pending_textures[t].second;
if (GfxRenderer.Material(sm->GetMaterial()).textures[0] == null_handle)
if (GfxRenderer->Material(sm->GetMaterial()).textures[0] == null_handle)
sm->ReplaceMaterial("internal_src:OPENVR" + std::to_string(texture_id));
opengl_texture &tex = GfxRenderer.Texture(GfxRenderer.Material(sm->GetMaterial()).textures[0]);
opengl_texture &tex = GfxRenderer->Texture(GfxRenderer->Material(sm->GetMaterial()).textures[0]);
if (tex.is_stub()) {
vr::RenderModel_TextureMap_t *texturemap;