mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added nodesize property to scale nodes

Browse Source
This commit is contained in:
Christian Adamsson
2020-06-08 17:22:52 +02:00
parent c33adb33ab
commit afc95a248c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fieldlinessequence/rendering/renderablestreamnodes.cpp
+5 -5
View File
@@ -185,7 +185,7 @@ namespace openspace {
glm::vec4(1.f))
, _pStreamsEnabled(StreamsenabledInfo, true)
, _pStreamGroup({ "Streams" })
, _pNodeSize(NodeSizeInfo, 1)
, _pNodeSize(NodeSizeInfo, 1.f, 1.f, 20.f)
, _pLineWidth(LineWidthInfo, 1.f, 1.f, 20.f)
{
@@ -462,8 +462,8 @@ namespace openspace {
static_cast<GLsizei>(_lineStart.size())
);*/
glPointSize(3);
glPointSize(_pNodeSize);
//glPointSize(3);
GLint temp = 0;
glDrawArrays(
GL_POINTS,
@@ -580,8 +580,8 @@ namespace openspace {
//'YYYY-MM-DDTHH-MM-SS-XXX.osfls'
//C:\Users\Chrad171\openspace\
std::ifstream streamdata("C:/Users/emiho502/desktop/OpenSpace/sync/http/bastille_day_streamnodes/1/datawithoutprettyprint_newmethod.json");
// std::ifstream streamdata("C:/Users/chris/Documents/openspace/Openspace_ourbranch/OpenSpace/sync/http/bastille_day_streamnodes/1/datawithoutprettyprint.json");
//std::ifstream streamdata("C:/Users/emiho502/desktop/OpenSpace/sync/http/bastille_day_streamnodes/1/datawithoutprettyprint_newmethod.json");
std::ifstream streamdata("C:/Users/chrad171//openspace/OpenSpace/sync/http/bastille_day_streamnodes/1/datawithoutprettyprint_newmethod.json");
if (!streamdata.is_open())
{
modules/fieldlinessequence/rendering/renderablestreamnodes.h
+1 -1
View File
@@ -100,7 +100,7 @@ namespace openspace {
// Group to hold the flow/particle properties
properties::PropertyOwner _pStreamGroup;
// Size of simulated node particles
properties::IntProperty _pNodeSize;
properties::FloatProperty _pNodeSize;
/// Line width for the line rendering part
properties::FloatProperty _pLineWidth;