b17ab3f8e9
fixed out of file check order
2017-02-02 15:26:40 +01:00
ff08ee7cea
error handling when out of file
2017-02-02 15:10:48 +01:00
8346e5916d
changed everything from std to qt
2017-02-02 14:44:48 +01:00
5372838420
further performance improvement
2017-02-02 11:14:16 +01:00
a14229aa71
further improvement on tga import
2017-02-01 17:53:42 +01:00
1c5631a5e0
improve image load performance,
...
can be improved more, but scanline has wrong results
2017-02-01 17:41:29 +01:00
37e9b86daa
fixed bug that sometimes alpha channel was not read in,
...
code improvement = performance,
2017-01-30 16:54:35 +01:00
4342260e6d
improved performance using my own tga load function always instead of QImage
...
improved Profiler
2017-01-30 16:00:14 +01:00
d1c68e8ba6
added Profiler to analyses the time used by code lines
2017-01-30 12:01:45 +01:00
9c16aa32f1
headlight,
...
bug fixes,
code improvement,
2017-01-30 11:31:37 +01:00
fbb51563c9
fixed backface culling bug,
...
todo: connect headligh
2017-01-30 00:02:32 +01:00
538453c1db
added headlight option to settings,
...
added cullface option to settings,
zoom speed now adjust at settings,
bugs:
cullface does not work anymore,
todo:
connect headlight
2017-01-29 23:47:14 +01:00
7b739ab892
use OutputDevice to set fileinfo,
...
use new connect function,
2017-01-29 15:19:20 +01:00
98302664ca
add OuputDevice as singleton to manage output to statusbar,
2017-01-29 11:35:43 +01:00
96b7d6f736
text in FileInfoWindow can be marked and copied,
...
code cleaning
2017-01-28 16:54:36 +01:00
121f5c47f1
fixed some warnings
2017-01-26 19:44:12 +01:00
fe374cb8f6
made fshader.glsl compatible with older versions
2017-01-26 18:25:24 +01:00
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
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
30d41f7d85
connected settings window with software
2017-01-24 17:09:51 +01:00
15cd551f7c
forgot light - background connection
2017-01-24 11:55:00 +01:00
16c9d35580
Removed slots, I use lambda now
2017-01-24 11:48:45 +01:00
11af758eee
use lambda expressions instead of slots
2017-01-24 11:40:38 +01:00
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
0a9103fdc5
differ vertexNormal and triangleNormal
2017-01-23 13:49:29 +01:00
10718f2269
load tx1d texture
2017-01-23 12:29:10 +01:00
b2df84eb4c
read tx1d tx2d tx3d texture names and print to info window
2017-01-23 12:17:26 +01:00
2ed9e475ce
fixed white scrollbar at the info window
2017-01-23 11:57:23 +01:00
cdd6ace701
save rendertype,
...
evaluate rednertype specular,
changed info window always on top
2017-01-22 15:41:08 +01:00
91488c55b2
more information for the InfoWindow,
...
set correct values for cloth material,
enable specular map
2017-01-22 14:37:06 +01:00
5f104e46f2
gui changes
2017-01-22 12:25:59 +01:00
a948590255
fixed flag reading bug
2017-01-21 17:16:44 +01:00
6fa81a8ccc
Some styling
2017-01-21 16:33:03 +01:00
c4444bcefd
fixed background bug,
...
support directional light,
zoom speed can be adjust via +/-
2017-01-21 15:22:43 +01:00
5ea90723b4
changed intensity of background
2017-01-20 16:54:27 +01:00
af94ecd541
change background when the light is on
2017-01-20 16:39:17 +01:00
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
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
eb0592373f
added attributes to materials
2017-01-20 10:49:43 +01:00
28d17b2fdd
trying to workaround gamma correction (remove from tga)
2017-01-19 20:15:00 +01:00
9fb3ca03bd
added specular, ambient light,...
...
need to fix the texutre gamma correction,
look at the todos
2017-01-19 17:57:50 +01:00
4c177f2ddc
adjust light functionality,
...
bugs:
- background cannot be changed during runtime
2017-01-18 17:01:43 +01:00
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
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
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
86c0559fdc
Merge branch 'master' of git.rwth-aachen.de:carstenf/OpenGL
2017-01-17 17:36:35 +01:00
1bcb4d67c1
fixed wrong dimension
2017-01-17 11:37:07 +01:00
152d436dd7
Calculate vertex position in world space in vertex shaded not in fragment
2017-01-17 11:36:23 +01:00
5191a46f72
Added light calculation to fragment shader
2017-01-17 11:32:06 +01:00
9b3ff7f737
adjust vertex shaded to pass information to fragment shaded for light
2017-01-17 11:15:30 +01:00
Anakin