Skip to content

Commit 31d1733

Browse files
committed
Optimize line width and line colors
1 parent e4d7813 commit 31d1733

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

source/unifiedmemory/Rendering.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ void Rendering::uninitialize()
179179
void Rendering::render()
180180
{
181181
static const auto colors = std::array<glm::vec3, 8>({{
182-
glm::vec3(228,26,28) / glm::vec3(255),
183-
glm::vec3(55,126,184) / glm::vec3(255),
184-
glm::vec3(77,175,74) / glm::vec3(255),
185-
glm::vec3(152,78,163) / glm::vec3(255),
186-
glm::vec3(255,127,0) / glm::vec3(255),
187-
glm::vec3(255,255,51) / glm::vec3(255),
188-
glm::vec3(166,86,40) / glm::vec3(255),
189-
glm::vec3(247,129,191) / glm::vec3(255)
182+
glm::vec3(27,158,119) / glm::vec3(255),
183+
glm::vec3(217,95,2) / glm::vec3(255),
184+
glm::vec3(117,112,179) / glm::vec3(255),
185+
glm::vec3(231,41,138) / glm::vec3(255),
186+
glm::vec3(102,166,30) / glm::vec3(255),
187+
glm::vec3(230,171,2) / glm::vec3(255),
188+
glm::vec3(166,118,29) / glm::vec3(255),
189+
glm::vec3(102,102,102) / glm::vec3(255)
190190
}});
191191

192192
const auto numIterations = m_dataBuffer->size() / m_sensorCount;
@@ -208,6 +208,7 @@ void Rendering::render()
208208
gl::glUseProgram(0);
209209

210210
gl::glPointSize(m_sensorCount > 8 ? 2.0f : 4.0f);
211+
gl::glLineWidth(m_sensorCount > 16 ? 1.0f : 2.0f);
211212

212213
gl::glBindVertexArray(m_plotVAO);
213214
gl::glBindBuffer(gl::GL_ARRAY_BUFFER, m_dataBuffer->gpuIdentifier());

source/unifiedmemory/main.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ int main(int argc, char ** argv)
193193
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
194194
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 5);
195195
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
196-
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
196+
//glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
197+
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_COMPAT_PROFILE);
197198

198199
GLFWwindow * window = nullptr;
199200

0 commit comments

Comments
 (0)