Skip to content

Commit 992cdfe

Browse files
committed
fix station, glows, linux CI
1 parent 080c5ab commit 992cdfe

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Source/Menus/TitleScreen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ void TitleScreen::DrawTitleScreenScene() {
619619
m_Station.SetPos(m_PlanetPos + m_StationOffset);
620620
m_Station.SetRotAngle(-c_HalfPI + m_StationOrbitRotation);
621621
//m_Station.Draw(g_FrameMan.GetBackBuffer32());
622-
DrawTextureEx(g_GLResourceMan.GetStaticTextureFromBitmap(m_Station.GetSpriteFrame(0)), m_Station.GetPos() + m_Station.GetSpriteOffset(), -m_StationOrbitRotation + PI/2.0f, 1.0f, {255, 255, 255, 255});
622+
DrawTextureEx(g_GLResourceMan.GetStaticTextureFromBitmap(m_Station.GetSpriteFrame(0)), m_Station.GetPos() + m_Station.GetSpriteOffset() + Vector(m_Station.GetSpriteFrame(0)->w / 2, m_Station.GetSpriteFrame(0)->h / 2), m_StationOrbitRotation - c_HalfPI, 1.0f, {255, 255, 255, 255});
623623
}
624624

625625
void TitleScreen::DrawGameLogo() {

Source/Renderer/BigTexture.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "BigTexture.h"
22
#include "glad/gl.h"
33
#include <algorithm>
4+
#include <cmath>
45
#include "Draw.h"
56
#include "GLResourceMan.h"
67

@@ -117,4 +118,4 @@ void BigTexture::Update(const Box& updateRegion) {
117118
glBindTexture(GL_TEXTURE_2D, 0);
118119
}
119120
}
120-
}
121+
}

Source/Renderer/raylib/rlgl.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,7 @@ typedef struct rlglData {
11061106
bool texAnisoFilter; // Anisotropic texture filtering support (GL_EXT_texture_filter_anisotropic)
11071107
bool computeShader; // Compute shaders support (GL_ARB_compute_shader)
11081108
bool ssbo; // Shader storage buffer object support (GL_ARB_shader_storage_buffer_object)
1109+
bool debug_output;
11091110

11101111
float maxAnisotropyLevel; // Maximum anisotropy level supported (minimum is 2.0f)
11111112
int maxDepthBits; // Maximum bits for depth component
@@ -2178,7 +2179,7 @@ void rlSetBlendFactorsSeparate(int glSrcRGB, int glDstRGB, int glSrcAlpha, int g
21782179
//----------------------------------------------------------------------------------
21792180
// Module Functions Definition - OpenGL Debug
21802181
//----------------------------------------------------------------------------------
2181-
#if defined(RLGL_ENABLE_OPENGL_DEBUG_CONTEXT) //&& defined(GRAPHICS_API_OPENGL_43)
2182+
#if defined(RLGL_ENABLE_OPENGL_DEBUG_CONTEXT) && defined(GRAPHICS_API_OPENGL_43)
21822183
static void GLAPIENTRY rlDebugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
21832184
{
21842185
// Ignore non-significant error/warning codes (NVidia drivers)
@@ -2394,6 +2395,7 @@ void rlLoadExtensions(void *loader)
23942395
RLGL.ExtSupported.texCompASTC = GLAD_GL_KHR_texture_compression_astc_hdr && GLAD_GL_KHR_texture_compression_astc_ldr;
23952396
RLGL.ExtSupported.texCompDXT = GLAD_GL_EXT_texture_compression_s3tc; // Texture compression: DXT
23962397
RLGL.ExtSupported.texCompETC2 = GLAD_GL_ARB_ES3_compatibility; // Texture compression: ETC2/EAC
2398+
RLGL.ExtSupported.debug_output = GLAD_GL_ARB_debug_output;
23972399
#if defined(GRAPHICS_API_OPENGL_43)
23982400
RLGL.ExtSupported.computeShader = GLAD_GL_ARB_compute_shader;
23992401
RLGL.ExtSupported.ssbo = GLAD_GL_ARB_shader_storage_buffer_object;

0 commit comments

Comments
 (0)