Commit Graph

231 Commits

Author SHA1 Message Date
Anakin
54b87b5de7 fixed things i've broken by the merge conflict 2017-06-20 11:58:03 +02:00
Anakin
68387fe7a7 Merge branch 'developement_1' of git.rwth-aachen.de:carstenf/OpenGL into developement_1
# Conflicts:
#	QtMeshViewer/Header/MainWindow.h
#	QtMeshViewer/Source/MainWindow.cpp
2017-06-20 11:45:15 +02:00
Anakin
44732057b6 using signal slot to update the combobox entries 2017-06-20 11:41:10 +02:00
2d34492517 Implemented qtreeviewwidget instead of a list 2017-06-18 09:33:02 -05:00
3f2713bd16 Fixed logic issue with offset file to file name in listWidget. Edited feel of settings window a bit 2017-06-18 06:46:45 -05:00
c2f7118ed6 Implemented recursive scan for mesh files on selection of dir path. Setup name instead of full path in list. 2017-06-18 06:17:40 -05:00
c6d82f5f55 Updated Settings to cleanup logic plus add a note for hard coded paths. 2017-06-18 06:14:10 -05:00
Anakin
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,
2017-06-17 15:42:43 +02:00
6141263f45 Edited open() function to be more descriptive. Set to openFileActual 2017-06-17 05:18:21 -05:00
e59dd980bd Temp update to show unexpected segfault error 2017-06-16 03:16:30 -05:00
1e71ebed47 Set ability to fill listWidget in SettingsWindow with saved dir list from SettingsManager. 2017-06-15 23:28:53 -05:00
d908894265 Added add and remove functionality to settings listWidget 2017-06-15 22:31:11 -05:00
Maxim Stewart
bddc7ea852 Getting dir list to the drop down field 2017-05-31 03:10:34 -05:00
Maxim Stewart
0372a4ad8c Setting up removing and adding stuff to the settings window dirlistview 2017-05-31 03:09:32 -05:00
Maxim Stewart
e768ae9af8 Setup dirList access from settings through getter and setters 2017-05-30 21:38:51 -05:00
Maxim Stewart
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.
2017-05-30 21:37:17 -05:00
Maxim Stewart
cdda1922fa Fixed accidental overload of function. 2017-05-30 07:49:54 -05:00
Maxim Stewart
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.
2017-05-30 07:42:14 -05:00
Maxim Stewart
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
2017-05-30 07:38:19 -05:00
Maxim Stewart
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
2017-05-30 07:12:50 -05:00
Anakin
7e87b14fe1 made all path relative now 2017-04-30 15:05:21 +02:00
Anakin
da0b7e3c5f new release version,
Features:
- fixed overexposed specular bug,
- most settings are saved after each session
Bugs:
-nothing known
2017-02-08 14:32:48 +01:00
Anakin
fa75e17d58 most settings are saved and restored 2017-02-08 14:29:22 +01:00
Anakin
49585945c3 fixed too high specular,
updated preview.jpg
2017-02-06 16:53:27 +01:00
Anakin
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
2017-02-06 14:59:46 +01:00
Anakin
06d403d546 support normal map now,
support "glow" now,
update preview.jpg
2017-02-06 14:53:05 +01:00
Anakin
541a975624 added preview imange,
passed data to shader,
need to process data in shader
2017-02-05 20:10:05 +01:00
Anakin
30f1a1e627 passing poylNormal, tangent, bitangent to shader 2017-02-05 16:57:12 +01:00
Anakin
cdf19911f6 calculate polygon normal, tangent, and bitangent,
next step, use them for calculation
2017-02-05 16:39:37 +01:00
Anakin
4c40d140a9 cloth now has specular 2017-02-05 15:25:59 +01:00
Anakin
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
2017-02-05 12:38:32 +01:00
Anakin
2d335474bf fixed camera control,
removed test exe
2017-02-05 12:34:24 +01:00
Anakin
a07d8acbec update gui for camera mods 2017-02-04 17:42:44 +01:00
Anakin
800a6a50f8 doesn't work for ggctuk since i use ogl 2.0 instead of 4.5
trying to figure out the problem
2017-02-04 15:57:15 +01:00
Anakin
94a2fa59ec added MoveCamera but isn't working well
updated about text,
2017-02-04 15:48:10 +01:00
Anakin
648b805daf forget to save file 2017-02-03 15:55:04 +01:00
Anakin
92245be302 finished OrbitCamera 2017-02-03 15:54:45 +01:00
Anakin
333eca25eb use class for camera handling,
orbit does not work. Need to figure out why
2017-02-02 18:01:08 +01:00
Anakin
b17ab3f8e9 fixed out of file check order 2017-02-02 15:26:40 +01:00
Anakin
ff08ee7cea error handling when out of file 2017-02-02 15:10:48 +01:00
Anakin
8346e5916d changed everything from std to qt 2017-02-02 14:44:48 +01:00
Anakin
5372838420 further performance improvement 2017-02-02 11:14:16 +01:00
Anakin
a14229aa71 further improvement on tga import 2017-02-01 17:53:42 +01:00
Anakin
1c5631a5e0 improve image load performance,
can be improved more, but scanline has wrong results
2017-02-01 17:41:29 +01:00
Anakin
bc5bfc62bc fixed a bug 2017-02-01 16:34:43 +01:00
Anakin
4cb070c8c5 removed files from repo that are not needed in the release folder 2017-01-30 17:24:21 +01:00
Anakin
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
2017-01-30 17:10:41 +01:00
Anakin
37e9b86daa fixed bug that sometimes alpha channel was not read in,
code improvement = performance,
2017-01-30 16:54:35 +01:00
Anakin
4342260e6d improved performance using my own tga load function always instead of QImage
improved Profiler
2017-01-30 16:00:14 +01:00
Anakin
d1c68e8ba6 added Profiler to analyses the time used by code lines 2017-01-30 12:01:45 +01:00