Commit Graph

76 Commits

Author SHA1 Message Date
Anakin fb49d8685a switch from QLineEdit to QSpinBox,
init SettingsWindow with default values from OglViewerWidget,
removed old qt project
2017-01-26 18:17:54 +01:00
Anakin 308d238b2d add settings icon,
set ogl verison to 2.0 to make it compatible with more PCs
2017-01-24 19:39:34 +01:00
Anakin 30d41f7d85 connected settings window with software 2017-01-24 17:09:51 +01:00
C-Fu 15cd551f7c forgot light - background connection 2017-01-24 11:55:00 +01:00
C-Fu 16c9d35580 Removed slots, I use lambda now 2017-01-24 11:48:45 +01:00
C-Fu 11af758eee use lambda expressions instead of slots 2017-01-24 11:40:38 +01:00
Anakin 73ee8a4040 added settings window,
connected all slider, lineEdits, checkboxes,...,
need to connect everything with the OglViewerWidget now
2017-01-23 16:09:06 +01:00
Anakin 0a9103fdc5 differ vertexNormal and triangleNormal 2017-01-23 13:49:29 +01:00
Anakin 10718f2269 load tx1d texture 2017-01-23 12:29:10 +01:00
Anakin b2df84eb4c read tx1d tx2d tx3d texture names and print to info window 2017-01-23 12:17:26 +01:00
Anakin 2ed9e475ce fixed white scrollbar at the info window 2017-01-23 11:57:23 +01:00
Anakin cdd6ace701 save rendertype,
evaluate rednertype specular,
changed info window always on top
2017-01-22 15:41:08 +01:00
Anakin 91488c55b2 more information for the InfoWindow,
set correct values for cloth material,
enable specular map
2017-01-22 14:37:06 +01:00
Anakin 5f104e46f2 gui changes 2017-01-22 12:25:59 +01:00
Anakin a948590255 fixed flag reading bug 2017-01-21 17:16:44 +01:00
Anakin 6fa81a8ccc Some styling 2017-01-21 16:33:03 +01:00
Anakin c4444bcefd fixed background bug,
support directional light,
zoom speed can be adjust via +/-
2017-01-21 15:22:43 +01:00
Anakin 5ea90723b4 changed intensity of background 2017-01-20 16:54:27 +01:00
Anakin af94ecd541 change background when the light is on 2017-01-20 16:39:17 +01:00
Anakin 9808cd03c0 save more material information,
hold default material in geometry separated,
load diffuse color if texture cannot be opened,
fixed gamma correction on the texture,
2017-01-20 16:26:58 +01:00
C-Fu abd9070e90 Read the material name and save it,
Shorten transparency evaluation,
Need to:
- read in the data values,
- save the texture name somewhere else,
- use the data :D
2017-01-20 11:18:48 +01:00
C-Fu eb0592373f added attributes to materials 2017-01-20 10:49:43 +01:00
Anakin 28d17b2fdd trying to workaround gamma correction (remove from tga) 2017-01-19 20:15:00 +01:00
Anakin 9fb3ca03bd added specular, ambient light,...
need to fix the texutre gamma correction,
look at the todos
2017-01-19 17:57:50 +01:00
Anakin 4c177f2ddc adjust light functionality,
bugs:
- background cannot be changed during runtime
2017-01-18 17:01:43 +01:00
Anakin a521dfc292 calculate normal matrix once in cpp (performance),
added bool variable to turn light on/off (still needs button),
2017-01-17 20:18:04 +01:00
Anakin f5863752e2 fixed the light problem,
very basic light at the moment, needs a lot of work:
- custom position,
- custom intensities,
- calculate at better positions,
others:
- adjust zoom speed
2017-01-17 18:03:47 +01:00
Anakin 1c962a481f implemented light into cpp,
bug:
everything is dark,
need to calculate the normal matrix once in cpp and not for every pixel
2017-01-17 17:48:54 +01:00
Anakin 86c0559fdc Merge branch 'master' of git.rwth-aachen.de:carstenf/OpenGL 2017-01-17 17:36:35 +01:00
C-Fu 1bcb4d67c1 fixed wrong dimension 2017-01-17 11:37:07 +01:00
C-Fu 152d436dd7 Calculate vertex position in world space in vertex shaded not in fragment 2017-01-17 11:36:23 +01:00
C-Fu 5191a46f72 Added light calculation to fragment shader 2017-01-17 11:32:06 +01:00
C-Fu 9b3ff7f737 adjust vertex shaded to pass information to fragment shaded for light 2017-01-17 11:15:30 +01:00
Anakin 91b3f25dbb fixed wireframe bug 2017-01-16 16:41:52 +01:00
Anakin 47c73ed881 added custom info window,
set min size to mainwindow
2017-01-16 15:41:37 +01:00
Anakin 86dfe32145 add wireframe paint option,
write file information on the screen,
bug fixes
2017-01-16 14:24:30 +01:00
Anakin 454ed45fa1 support transparency now 2017-01-15 15:51:12 +01:00
Anakin b8f8a5c2ad fixed the problem 2017-01-15 12:33:57 +01:00
Anakin 6ead5d7bc6 working on changing the texture names to materials,
problems with call by value/reference
2017-01-15 12:26:15 +01:00
Anakin f469dff656 added transparency support,
need to sort the transparent things to the back
2017-01-14 17:20:50 +01:00
Anakin 930c49e9c7 add screenshot function 2017-01-11 16:28:51 +01:00
Anakin 77ffe7baf4 added icons 2017-01-09 16:34:54 +01:00
Anakin 948578f506 add normal to VertexData 2017-01-08 14:41:53 +01:00
Anakin 5c2f5503fc new release version,
forgot to update the help text
2017-01-08 12:36:08 +01:00
Anakin 3be5793ffc limit pitch to [-90,90] 2017-01-08 12:21:56 +01:00
Anakin f5ee8a973d Using QString now,
fileinfo works now
2017-01-07 15:59:16 +01:00
Anakin 8c2ca44f20 added limited rotation,
2 directions do not work
2017-01-07 12:46:06 +01:00
Anakin e963b7538e fixed texture problem 2017-01-05 16:18:01 +01:00
Anakin b58b7c47e5 some buttons added 2017-01-05 16:04:51 +01:00
Anakin 44e36b8b0d trying to fix the 2xEmit bug,
write directly mirrored to the image,
2017-01-05 14:46:01 +01:00