68387fe7a7
Merge branch 'developement_1' of git.rwth-aachen.de:carstenf/OpenGL into developement_1
Anakin2017-06-20 11:45:15 +02:00
44732057b6
using signal slot to update the combobox entries
Anakin2017-06-20 11:41:10 +02:00
2d34492517
Implemented qtreeviewwidget instead of a list
itdominator2017-06-18 09:32:19 -05:00
3f2713bd16
Fixed logic issue with offset file to file name in listWidget. Edited feel of settings window a bit
itdominator2017-06-18 06:45:40 -05:00
c2f7118ed6
Implemented recursive scan for mesh files on selection of dir path. Setup name instead of full path in list.
itdominator2017-06-18 06:15:23 -05:00
c6d82f5f55
Updated Settings to cleanup logic plus add a note for hard coded paths.
itdominator2017-06-18 06:14:01 -05:00
33fafb29a8
removed unused or useless stuff, renamed some functions for better description, repaired the SettingsManager usage, ToDo: Dropdown list is not updated, it needs a restart, display names for the directories instead of the path,
Anakin2017-06-17 15:42:43 +02:00
6141263f45
Edited open() function to be more descriptive. Set to openFileActual
itdominator2017-06-17 05:18:18 -05:00
e59dd980bd
Temp update to show unexpected segfault error
itdominator2017-06-16 03:16:30 -05:00
1e71ebed47
Set ability to fill listWidget in SettingsWindow with saved dir list from SettingsManager.
itdominator2017-06-15 23:28:47 -05:00
d908894265
Added add and remove functionality to settings listWidget
itdominator2017-06-15 22:31:11 -05:00
0372a4ad8c
Setting up removing and adding stuff to the settings window dirlistview
Maxim Stewart2017-05-31 03:09:20 -05:00
e768ae9af8
Setup dirList access from settings through getter and setters
Maxim Stewart2017-05-30 21:38:51 -05:00
b089fcdaf6
Added settings for getting drop down filled and set list to hide folders. Need to make a dirList setter plus get settings window to keep dirList for editing.
Maxim Stewart2017-05-30 21:37:17 -05:00
031c620f52
Added filter to QFileSystemModel fmodel Setup some comments regarding a setFilter part Edited getAssetLibrary to pass arguments to setAsset -- Note will be used for dropdown interaction. Set a temp path for testing purposes.
Maxim Stewart2017-05-30 07:42:11 -05:00
7a41f2d9bf
Added QFileSystemModel for the fileListView or aka treeView Added QString filters to be used with QFileSystemModel Added setAsset method as part of getAssetLibrary for reusability
Maxim Stewart2017-05-30 07:34:06 -05:00
b2efa83e17
Added check for qkList in meshviewer.config Added QString listOfDirs Added gettter method to get listOfDirs Edited MainWindow.ui to prepare for list of file plus dir drop down
Maxim Stewart2017-05-30 07:11:39 -05:00
7e87b14fe1
made all path relative now
Anakin2017-04-30 15:05:21 +02:00
da0b7e3c5f
new release version, Features: - fixed overexposed specular bug, - most settings are saved after each session Bugs: -nothing known
Version_1.2.4
Anakin2017-02-08 14:32:48 +01:00
fa75e17d58
most settings are saved and restored
Anakin2017-02-08 14:29:22 +01:00
49585945c3
fixed too high specular, updated preview.jpg
Anakin2017-02-06 16:53:27 +01:00
67657061b6
new release version, Features: - normal map support, - added specular support for cloth, - "glow" support, Bugs: - normal mapping looks a bit drizzly depending on the angle of view
Version_1.2.3
Anakin2017-02-06 14:59:46 +01:00
06d403d546
support normal map now, support "glow" now, update preview.jpg
Anakin2017-02-06 14:53:05 +01:00
541a975624
added preview imange, passed data to shader, need to process data in shader
Anakin2017-02-05 20:10:05 +01:00
30f1a1e627
passing poylNormal, tangent, bitangent to shader
Anakin2017-02-05 16:57:12 +01:00
cdf19911f6
calculate polygon normal, tangent, and bitangent, next step, use them for calculation
Anakin2017-02-05 16:39:37 +01:00
4c40d140a9
cloth now has specular
Anakin2017-02-05 15:25:59 +01:00
f47e1cc76a
new release version, Features: - extreme performance improvement when loading files, - new camera controls (free, orbital, move), - using ogl 4.5 again since 2.0 causes problems on some pc, Bugs: - nothing known
Version_1.2.2
Anakin2017-02-05 12:38:32 +01:00
2d335474bf
fixed camera control, removed test exe
Anakin2017-02-05 12:34:24 +01:00
a07d8acbec
update gui for camera mods
Anakin2017-02-04 17:42:44 +01:00
800a6a50f8
doesn't work for ggctuk since i use ogl 2.0 instead of 4.5 trying to figure out the problem
Anakin2017-02-04 15:57:15 +01:00
94a2fa59ec
added MoveCamera but isn't working well updated about text,
Anakin2017-02-04 15:48:10 +01:00
4cb070c8c5
removed files from repo that are not needed in the release folder
Anakin2017-01-30 17:24:21 +01:00
2d9c103c01
new release version, Features: - Headlight option, - zoom speed now adjust in settings window, not via +/-, - cullface can be activated in the settings, - text in FileInfoWindow can be marked and copied, - alpha channel now always used, - fixed compatibility problems, - code and performance improvements, Bugs: - nothing known
Version_1.2.1
Anakin2017-01-30 17:10:41 +01:00
37e9b86daa
fixed bug that sometimes alpha channel was not read in, code improvement = performance,
Anakin2017-01-30 16:54:35 +01:00
4342260e6d
improved performance using my own tga load function always instead of QImage improved Profiler
Anakin2017-01-30 16:00:14 +01:00
d1c68e8ba6
added Profiler to analyses the time used by code lines
Anakin2017-01-30 12:01:45 +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
Anakin2017-01-29 23:47:14 +01:00
7b739ab892
use OutputDevice to set fileinfo, use new connect function,
Anakin2017-01-29 15:19:20 +01:00
98302664ca
add OuputDevice as singleton to manage output to statusbar,
Anakin2017-01-29 11:35:43 +01:00
96b7d6f736
text in FileInfoWindow can be marked and copied, code cleaning
Anakin2017-01-28 16:54:36 +01:00
fe374cb8f6
made fshader.glsl compatible with older versions
Anakin2017-01-26 18:25:24 +01:00
fb49d8685a
switch from QLineEdit to QSpinBox, init SettingsWindow with default values from OglViewerWidget, removed old qt project
Anakin2017-01-26 18:17:54 +01:00
3167f1acb8
new release version, Features: - screenshot function, - transparency support, - wireframe paint option, - support phong model (ambient, diffuse, specular), - 2 different kinds of light (directional and point), - different background colors for light on/off, - zoom speed now adjustable via +/- keys, - new file info window, - more information displayed at the info window, - settings window, - new GUI, - now openGl 2.0 is minimum (before 4.5) - some more code changes, bug fixes, performance improvements, Bugs: - nothing known
Version_1.2.0
Anakin2017-01-24 19:46:48 +01:00
308d238b2d
add settings icon, set ogl verison to 2.0 to make it compatible with more PCs
Anakin2017-01-24 19:39:34 +01:00
30d41f7d85
connected settings window with software
Anakin2017-01-24 17:09:51 +01:00
16c9d35580
Removed slots, I use lambda now
C-Fu2017-01-24 11:48:45 +01:00
11af758eee
use lambda expressions instead of slots
C-Fu2017-01-24 11:40:38 +01:00
73ee8a4040
added settings window, connected all slider, lineEdits, checkboxes,..., need to connect everything with the OglViewerWidget now
Anakin2017-01-23 16:09:06 +01:00
0a9103fdc5
differ vertexNormal and triangleNormal
Anakin2017-01-23 13:49:29 +01:00
c4444bcefd
fixed background bug, support directional light, zoom speed can be adjust via +/-
Anakin2017-01-21 15:22:43 +01:00
5ea90723b4
changed intensity of background
Anakin2017-01-20 16:54:27 +01:00
af94ecd541
change background when the light is on
Anakin2017-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,
Anakin2017-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
C-Fu2017-01-20 11:18:48 +01:00
eb0592373f
added attributes to materials
C-Fu2017-01-20 10:49:43 +01:00
28d17b2fdd
trying to workaround gamma correction (remove from tga)
Anakin2017-01-19 20:15:00 +01:00
9fb3ca03bd
added specular, ambient light,... need to fix the texutre gamma correction, look at the todos
Anakin2017-01-19 17:57:50 +01:00
4c177f2ddc
adjust light functionality, bugs: - background cannot be changed during runtime
Anakin2017-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),
Anakin2017-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
Anakin2017-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
Anakin2017-01-17 17:48:54 +01:00
86c0559fdc
Merge branch 'master' of git.rwth-aachen.de:carstenf/OpenGL
Anakin2017-01-17 17:36:35 +01:00