 Sebastian Piwell
|
c983ecfb89
|
Histogram eq with group dataprocessor
|
2016-05-20 16:46:33 -04:00 |
|
|
Kalle Bladin
|
faa52404b2
|
Merge branch 'feature/camera' into feature/interaction
|
2016-05-20 16:09:53 -04:00 |
|
|
Kalle Bladin
|
309c97098c
|
Changed interface of camera class
|
2016-05-20 16:09:35 -04:00 |
|
|
Kalle Bladin
|
dcd00e77d0
|
Minor structural changes in interaction handler.
|
2016-05-20 16:03:30 -04:00 |
|
|
Kalle Bladin
|
3ff322c282
|
Clean up camera class
|
2016-05-20 12:03:05 -04:00 |
|
|
Kalle Bladin
|
74f190ef7e
|
More clean up in camera class.
|
2016-05-20 11:46:36 -04:00 |
|
|
Kalle Bladin
|
e057f60a18
|
Remove psc internally from camera class.
|
2016-05-20 10:31:33 -04:00 |
|
|
Kalle Bladin
|
1db9f2f60c
|
Clean up camera class.
|
2016-05-19 23:21:48 -04:00 |
|
|
Kalle Bladin
|
9dda48d44b
|
Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class.
|
2016-05-19 12:22:55 -04:00 |
|
|
Kalle Bladin
|
4ac19f21b7
|
Solve merge conflict.
|
2016-05-19 12:10:14 -04:00 |
|
|
Kalle Bladin
|
0215c63bab
|
Camera class compiles but missing implementation of two functions.
|
2016-05-19 11:29:31 -04:00 |
|
|
Emil Axelsson
|
f8007266e8
|
Merge branch 'feature/hybrid-renderer' into feature/galaxy
|
2016-05-19 15:25:10 +02:00 |
|
|
Sebastian Piwell
|
ff39239b0f
|
Auto filter of 'background'
|
2016-05-17 16:11:57 -04:00 |
|
|
Michael Nilsson
|
ae131f88c5
|
changed the naming of min and max value in histogram class
|
2016-05-17 14:02:40 -04:00 |
|
|
Michael Nilsson
|
7549beb5f2
|
solve merge conflict
|
2016-05-17 12:53:29 -04:00 |
|
|
Michael Nilsson
|
d2e913b70e
|
moved histogram class to core
|
2016-05-17 12:49:16 -04:00 |
|
|
Erik Broberg
|
afd8ba5e9b
|
Added copy constructor for Camera
|
2016-05-11 18:36:19 -04:00 |
|
|
Sebastian Piwell
|
e51b104ce8
|
Transformation Manager
|
2016-05-10 11:18:09 -04:00 |
|
|
Sebastian Piwell
|
39ff2415bb
|
Name changes
|
2016-05-09 13:09:47 -04:00 |
|
|
Michael Nilsson
|
f2b802b317
|
MemoryFile har now char pointer and size instead of string
|
2016-05-06 16:39:24 -04:00 |
|
|
Michael Nilsson
|
d63dd7db44
|
remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile
|
2016-05-06 15:56:12 -04:00 |
|
|
Michael Nilsson
|
cbd6fd9234
|
iswacygnets now use new download funtions aswell
|
2016-05-06 15:09:09 -04:00 |
|
|
Michael Nilsson
|
47e2abf87d
|
new download function using std::future and std::async
|
2016-05-06 10:48:27 -04:00 |
|
|
Michael Nilsson
|
d0e6c8dd6e
|
removed progresscallback from downloadToMemory
|
2016-05-05 11:07:00 -04:00 |
|
|
Kalle Bladin
|
04a363bab1
|
Merge branch 'develop' into feature/globebrowsing
|
2016-05-04 15:57:44 -04:00 |
|
|
Michael Nilsson
|
3a80405c30
|
solve merge conflict
|
2016-05-04 12:10:49 -04:00 |
|
|
Sebastian Piwell
|
355e70ca0a
|
Remove cygnet groups
|
2016-05-03 17:13:28 -04:00 |
|
|
Michael Nilsson
|
0d49076c54
|
solve merge conflict with develop
|
2016-05-03 17:11:28 -04:00 |
|
|
Sebastian Piwell
|
1e4e8919c3
|
Set attributes of screenspacerenderable through dictionary
|
2016-05-03 15:35:33 -04:00 |
|
|
Michael Nilsson
|
c34fa48c73
|
add script to remove screenspacerenderables from renderengine
|
2016-05-03 13:30:22 -04:00 |
|
|
Michael Nilsson
|
4d61694f75
|
ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory
|
2016-05-03 10:39:32 -04:00 |
|
|
Alexander Bock
|
20532d704f
|
Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
|
2016-04-30 14:18:08 +02:00 |
|
|
Sebastian Piwell
|
b67180e325
|
Add transferFunction to dataplane
|
2016-04-27 14:47:06 -04:00 |
|
|
Alexander Bock
|
75175512a8
|
First implementation of moving the startup scripts into the scene description files
|
2016-04-27 16:46:31 +02:00 |
|
|
Emil Axelsson
|
7db9bf0d98
|
start on experimental hybrid renderer
|
2016-04-26 10:20:54 +02:00 |
|
|
Sebastian Piwell
|
f13367e717
|
Kameleon plane
|
2016-04-25 10:37:06 -04:00 |
|
|
Sebastian Piwell
|
0246cd482e
|
Solved merge conflict
|
2016-04-22 20:01:15 -04:00 |
|
|
Sebastian Piwell
|
f6bbce8b4c
|
Add extension to futurefile
|
2016-04-22 17:39:45 -04:00 |
|
|
Michael Nilsson
|
c72536fbbc
|
untabify to make merge easier
|
2016-04-20 15:21:30 -04:00 |
|
|
Michael Nilsson
|
07dfafeddb
|
solve merge conflict with develop
|
2016-04-20 15:03:51 -04:00 |
|
|
Michael Nilsson
|
a068ca2030
|
load cygnets through mod file
|
2016-04-20 09:47:20 -04:00 |
|
|
Kalle Bladin
|
aaa099d542
|
Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality.
|
2016-04-18 23:05:19 -04:00 |
|
|
Kalle Bladin
|
ada97704f8
|
Solve compilation problems for OSX.
|
2016-04-18 22:44:20 -04:00 |
|
|
Erik Broberg
|
4073f4e6cb
|
Merged in branch develop to feature/globebrowsing
|
2016-04-18 20:02:42 -04:00 |
|
|
Alexander Bock
|
906470f28e
|
Untabify the rest of the source files
Update Ghoul repository
|
2016-04-18 20:14:29 +02:00 |
|
|
Alexander Bock
|
a21c9538b6
|
Untabify more files
|
2016-04-18 15:15:30 +02:00 |
|
|
Alexander Bock
|
4936a4a084
|
Remove sgct.h inclusion from LuaConsole
Untabify more files
|
2016-04-18 11:12:12 +02:00 |
|
|
Alexander Bock
|
46b207b379
|
Removing some cppcheck warnings
|
2016-04-14 22:49:03 -04:00 |
|
|
Alexander Bock
|
b43a454e9f
|
Fix GCC compiler warnings
|
2016-04-14 22:40:25 -04:00 |
|
|
Erik Broberg
|
3ec7badcf0
|
Camera: added convenience method for getting viewRotation and added inner class SyncData
|
2016-04-14 17:33:52 -04:00 |
|