mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-23 20:50:59 -05:00
Make max width 90 columns
This commit is contained in:
@@ -52,8 +52,6 @@ namespace openspace {
|
||||
void setScale(float scalingFactor);
|
||||
void setWebpageBorderColor(glm::ivec3 color);
|
||||
|
||||
// Communication with the web page
|
||||
void executeJavascript(std::string script);
|
||||
void sendIdToBrowser();
|
||||
|
||||
// Display
|
||||
@@ -82,6 +80,9 @@ namespace openspace {
|
||||
//void translate(glm::vec2 translation);
|
||||
|
||||
private:
|
||||
// Communication with the web page
|
||||
void executeJavascript(std::string script);
|
||||
|
||||
// Properties
|
||||
properties::FloatProperty _verticalFov;
|
||||
properties::StringProperty _skyTargetId;
|
||||
|
||||
@@ -79,7 +79,14 @@ namespace openspace {
|
||||
bool _lockAfterAnimation{ false };
|
||||
|
||||
// Shader
|
||||
UniformCache(modelTransform, viewProj, showCrosshair, showRectangle, lineWidth, dimensions, lineColor) _uniformCache;
|
||||
UniformCache(
|
||||
modelTransform,
|
||||
viewProj,
|
||||
showCrosshair,
|
||||
showRectangle,
|
||||
lineWidth,
|
||||
dimensions,
|
||||
lineColor) _uniformCache;
|
||||
GLuint _vertexArray = 0;
|
||||
GLuint _vertexBuffer = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user