Some attempts at getting the OSX port to work, but no deal.

BSVino · Feb 6, 2016 · ce9c201 · ce9c201
1 parent e86f4e5
commit ce9c201
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/content/shaders/model.fs b/content/shaders/model.fs
@@ -116,6 +116,7 @@ void main()
 
 	// Use that as our output color
 	vecOutputColor = vecFoggedDiffuse;
+	vecOutputColor.r = 1.0;
 
 	if (vecDiffuse.a < 0.01)
 		discard;

diff --git a/renderer/renderer.cpp b/renderer/renderer.cpp
@@ -53,6 +53,11 @@ CRenderer::CRenderer(size_t iWidth, size_t iHeight)
 	GLCall(glBindFramebuffer(GL_FRAMEBUFFER, 0));
 	GLCall(glGetIntegerv(GL_SAMPLES, &m_iScreenSamples));
 
+	GLCall(glGenVertexArrays(1, &m_default_vao));
+	GLCall(glBindVertexArray(m_default_vao));
+
+	GLCall(glGenBuffers(1, &m_dynamic_mesh_vbo));
+
 	SetSize(iWidth, iHeight);
 
 	m_bDrawBackground = true;

diff --git a/renderer/renderer.h b/renderer/renderer.h
@@ -139,6 +139,9 @@ class CRenderer
 	Vector2D        m_vecFullscreenTexCoords[6];
 	Vector          m_vecFullscreenVertices[6];
 
+	uint32_t        m_default_vao;
+	uint32_t        m_dynamic_mesh_vbo;
+
 	bool			m_bDrawBackground;
 
 	bool			m_bUseMultisampleTextures;

diff --git a/renderer/renderingcontext.cpp b/renderer/renderingcontext.cpp
@@ -765,6 +765,11 @@ void CRenderingContext::EndRender()
 
 	oContext.m_bProjectionUpdated = oContext.m_bViewUpdated = oContext.m_bTransformUpdated = true;
 
+	GLCall(glBindVertexArray(m_pRenderer->m_default_vao));
+
+	GLCall(glBindBuffer(GL_ARRAY_BUFFER, m_pRenderer->m_dynamic_mesh_vbo));
+	GLCall(glBufferData(GL_ARRAY_BUFFER, GLsizeiptr((size_t)s_avecVertices.size() * sizeof(float)), s_avecVertices.data(), GL_STATIC_DRAW));
+
 	if (m_bTexCoord)
 	{
 		for (size_t i = 0; i < MAX_TEXTURE_CHANNELS; i++)