Commit Graph

570 Commits

Author SHA1 Message Date
Alexander Bock d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Alexander Bock cf53b5c1b0 Let the LuaConsole use a permanent cached file for the history 2014-12-05 16:43:16 +01:00
Alexander Bock a0e927da14 Renamed Lua function printImage to takeScreenshot
Fixed takeScreenshot to actually take a screenshot
2014-12-05 16:14:30 +01:00
Alexander Bock 805123d54d Update cloc definition to catch more GLSL files 2014-12-05 14:35:45 +01:00
Alexander Bock 50076e4640 Fixing the flickering of the star rendering (#66) 2014-12-05 14:13:37 +01:00
Alexander Bock 2b79b85124 Started bugfix for renderable stars flickering bug 2014-12-05 11:56:43 +01:00
jonasstrandstedt 99d075f727 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-04 23:28:15 +01:00
jonasstrandstedt 11e867aaf1 Fixed bug that causes crash if Focus node wasn't found 2014-12-04 23:27:18 +01:00
Alexander Bock 5497f25725 Added the selection property to the RenderableConstellationBounds 2014-12-04 23:05:51 +01:00
Alexander Bock 08378888a6 Fixed the SelectionProperty 2014-12-04 23:04:54 +01:00
Alexander Bock 4ba81a5d6c Add SelectionProperty 2014-12-04 21:29:25 +01:00
Alexander Bock 612e48455d Update ghoul reference 2014-12-04 19:20:55 +01:00
Alexander Bock da80fc7251 Merge branch 'feature/constallationbounds' into develop 2014-12-04 19:19:50 +01:00
Alexander Bock fe9db28310 Finished with current version of ConstellationBounds 2014-12-04 19:12:31 +01:00
Alexander Bock 89890f66ed Use correct openspace-data 2014-12-04 18:38:17 +01:00
Alexander Bock 3f35b0a948 More optimizations for RenderableConstellationBounds 2014-12-04 18:37:15 +01:00
Alexander Bock 38b1c00d3d Fix RenderableConstellationBounds name
Make rendering more efficient
2014-12-04 18:05:13 +01:00
Alexander Bock e735e8f90a Update glslLangDef file 2014-12-04 16:55:26 +01:00
Alexander Bock 40c537f858 Add a definition file to make cloc understand glsl files 2014-12-04 16:30:32 +01:00
Alexander Bock 0d48766f7d Move the cmake include files from ext to support/cmake 2014-12-04 16:30:16 +01:00
Alexander Bock aa27a0f882 Move the doxygen files from doxygen to support/doxygen 2014-12-04 16:29:39 +01:00
Alexander Bock b2cb6fb584 Change some more code in preparation of the new SGCT version 2014-12-04 16:28:49 +01:00
Jonas Strandstedt fcf4bd622a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-04 14:37:27 +01:00
Jonas Strandstedt ba4a55fd88 Removed references to OpenCL 2014-12-04 14:36:55 +01:00
Jonas Strandstedt d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Alexander Bock 5d168c18e5 First working version 2014-12-04 00:55:25 +01:00
Alexander Bock 1a590f83e0 Initial commit of constallation bounds 2014-12-04 00:18:37 +01:00
Alexander Bock cb526c7736 Update ghoul repository 2014-12-03 20:39:16 +01:00
Alexander Bock dedb825fcf Added missing implementation to retrieve non-const renderable 2014-12-03 18:06:54 +01:00
Alexander Bock 8c2dfb13bb Enable querying for Renderables in query.h 2014-12-03 17:19:18 +01:00
Alexander Bock 14051455a5 Fix error that appears when creating directories on first start 2014-12-03 17:19:01 +01:00
Jonas Strandstedt 47c68ade3c Small fix for finding the SGCT configuration path 2014-12-03 16:42:22 +01:00
Jonas Strandstedt 279e9e82ba Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 16:31:16 +01:00
Jonas Strandstedt 4ff9f08473 Changes to conform to new ghoul ProgramObject::Build interface 2014-12-03 16:30:25 +01:00
Alexander Bock 36d3b6bf74 Be able to set the SGCT configuration file using the commandline arguments 2014-12-03 16:09:24 +01:00
Alexander Bock aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00
Alexander Bock f1659e5c8b Minor workover of the logging creating facility 2014-12-03 15:42:35 +01:00
Jonas Strandstedt f7b2bc12e0 Added billboard support for RenderablePlane 2014-12-03 14:48:50 +01:00
Jonas Strandstedt a5e122b822 Improved the Lua documentation
- Lua documentation now needs a string giving the arguments list.
- When generating documentation first prints the command list and then prints
  the documentation for each command.
- Supports fixed max line length (set to 80)
- Uses four blank spaces as padding (easily replacable)
2014-12-03 14:13:53 +01:00
Jonas Strandstedt fc6fbf1587 Fix for multi node rendering in release mode
- Working but maybe temporary fix checking that the SyncBuffer object is
  not nullptr.
- Might need changing from heap to stack allocated object
  instead.
2014-12-03 13:18:04 +01:00
Alexander Bock 0dc2a9d030 Allow the configuration file to request logging functionality 2014-12-03 00:39:42 +01:00
Alexander Bock 56e9892c56 Remove warnings from RenderEngine 2014-12-03 00:18:15 +01:00
Alexander Bock eb6641a87b Updated Spice reference
Updated Ghoul reference
Added possible check-point for dome mismatch in rendering
2014-12-02 23:12:10 +01:00
Jonas Strandstedt 69ce7c9e00 Fix LuaConsole history issues
- Fix bug when adding command when history is empty
- Fixed loading of history from file
2014-12-02 11:48:15 +01:00
Jonas Strandstedt f0722700cf Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/scenegraph/scenegraph.cpp
2014-12-02 11:19:51 +01:00
Jonas Strandstedt 8196645284 Added support for placing camera att arbitrary position
- Pointing to openspace-data commit that reflects postition changes
- Fix camera to have correct rotation on startup
2014-12-02 11:06:15 +01:00
Hans-Christian Helltegen fd614efb71 Merge fix 2014-12-02 09:19:34 +01:00
Hans-Christian Helltegen 5b1b8694dc Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines 2014-12-01 16:40:01 +01:00
Hans-Christian Helltegen 834612469c Finalized the billboard rendering. Code cleanup 2014-12-01 16:27:30 +01:00
Alexander Bock 1cf408b523 Merge local branch 2014-11-29 14:05:42 +01:00