Commit Graph
100 Commits
Author SHA1 Message Date
Anakin 3758a2601c cleanup data after file is no longer needed 2016-12-31 13:11:14 +01:00
Anakin 9a5d09b80c fixed crash 2016-12-31 13:04:03 +01:00
Anakin ee8705f9e4 draw all models from vector,
window cosmetic,
next:
texture,
calculate modelmatrix from parent
2016-12-31 12:31:38 +01:00
Anakin c96d05decb fixed the triangle problem :D
next:
add texture import,
test multiedged mesh,
add open button,
add drag n' drop
2016-12-30 15:39:31 +01:00
Anakin d63d5276a1 Merge branch 'master' of git.rwth-aachen.de:carstenf/OpenGL 2016-12-30 15:07:29 +01:00
Anakin 32b0a95afb use import data 2016-12-30 15:06:26 +01:00
Anakin e863c68a77 added movement and zoom 2016-12-30 13:28:07 +01:00
Anakin 353d932147 import msh file,
problems:
it is not correctly displayed (vertice and what happend to the texture?)
todo:
improve the import, remove unused garbage,
add move and zoom function
2016-12-30 12:36:05 +01:00
Anakin 82ce8ad72a manage data in vectors 2016-12-29 14:06:25 +01:00
Anakin 0499982150 move texture to GeometryEngine 2016-12-29 13:37:15 +01:00
Anakin faea3b0737 removed timer rotation, now the user has full control,
added keyboard support,
reset rotation with space
2016-12-27 14:05:39 +01:00
Anakin a30f1b125c added Qt Example, next change it to fit my project 2016-12-24 16:03:37 +01:00
Anakin b6ef34f988 still trying to fix the problem 2016-12-14 17:20:20 +01:00
Anakin 96379a9afb fixed texture error 2016-12-13 19:07:36 +01:00
Anakin 481256e8ea added open file ability from the old project to Qt,
texture seams not to open,
texture display does not work
2016-12-12 16:47:38 +01:00
Anakin 1cc4f1ca90 removed vertex class (i have my own data structure)
implemented the glInit and glPaint function
2016-12-12 12:38:13 +01:00
Anakin 53ac8c3e5b copied from the old Ppoject:
shaders,
object class
Modified to use better names and use Qt things
2016-12-11 17:46:22 +01:00
Anakin 5faf584d84 First triangle drawn in Qt Project 2016-12-10 14:42:00 +01:00
Anakin 8cf86a41eb Added new Project using Qt,
There is garbage left from Qt??
2016-12-09 15:56:45 +01:00
Anakin 1c5a33cfa7 different quat2eul function from the internet 2016-12-03 14:33:15 +01:00
Anakin 4078347023 fixed cloth problem 2016-12-03 13:39:57 +01:00
Anakin 46c4a166c4 code improvement 2016-12-02 14:04:01 +01:00
Anakin 1918d5c844 new release version,
Features:
- performance improvement,
- code improvement,
- move the model to the center,
- scale everything to 1,
- do not open a default file for release build
Bugs:
- cloth is not displayed correctly,
- turning in the wrong x direction when model is turned 180° in y direction,
- consular class corvette is not displayed,
- rep_weap_LJ-50 is not displayed correctly
2016-12-02 13:07:49 +01:00
Anakin 3118118953 some fixes 2016-12-02 13:00:38 +01:00
Anakin 9b3d12dfeb scale everything to 1,
cloth not displayed completely,
corvette is not displayed why?
2016-12-02 12:10:52 +01:00
Anakin a47eefe92e move the model to the center,
clean up variables,
use delete[]
2016-12-01 19:51:11 +01:00
Anakin 1c0ed61b34 adjust boundingbox (only for SINF)
use else if
2016-11-30 17:05:39 +01:00
Anakin ef2c341a1a using c++11 loops,
reading bbox for each geom,
added some TODO
use the bbox information
2016-11-28 14:04:09 +01:00
Anakin 5ab2f2eaf9 fixed the memory garbage problem 2016-11-26 15:39:59 +01:00
Anakin 5c5b9ac2f1 don't copy the model list. It can be very big - using pointer now,
garbage is not from the texture or object changes
2016-11-25 16:14:33 +01:00
Anakin e1e8e165fe removed unused information from texture,
don't copy the data, give a pointer,
there is some data left, need to find out if it's from these changes
2016-11-24 19:40:17 +01:00
Anakin 97a38d5260 new release version,
Features:
- fixed texture problem
- fixed multi polygon problem
Bugs:
- cloth not working correctly,
- seams that bones as parent do not work
2016-11-23 17:34:03 +01:00
Anakin 23ce58291e fixed the multiedged polygons 2016-11-23 17:30:38 +01:00
Anakin 232acedce7 trying to fix the polygon mess up,
added new multipoly for testing
2016-11-22 20:05:02 +01:00
Anakin 60cc7bb562 fixed messed up textures of the cluster 2016-11-21 15:02:33 +01:00
Anakin 9abd285239 new release version,
Features:
- reset view before loading new mesh
- reset view when pressing space
- clustered msh can be displayed
- shadow mesh, nulls, bones, hidden things are no longer displayed
- now mulitpolygons can be displayed
- fasten and improved code
Bugs:
- cluster mixed up textures,
- at most mesh only every 2nd triangle is displayed,
- triangulation is not very good (DarthDUCK's Proton charge)
2016-11-20 17:00:17 +01:00
Anakin bcdc17c362 shorten code,
tested multipoly, there are some problems, look at the README.md,
2016-11-20 16:56:56 +01:00
Anakin b3a8b4bb81 triangulation implemented,
now need to test it
2016-11-20 16:46:49 +01:00
Anakin f81f03353d cloth stores the data in vectors, too;
removed the old unused code
2016-11-20 13:09:02 +01:00
Anakin 9ac1a25954 fixed the uv problem 2016-11-20 12:38:22 +01:00
Anakin 57df0a2e15 use different variables to store the data. The aim is to handle even not triangulated mesh files.
At the moment there is a problem with the UV using the new method
2016-11-20 12:26:23 +01:00
Anakin 927ce1cd0a fixed warnings 2016-11-16 14:18:11 +01:00
Anakin f4d8018f8f workaround: don't read Data from bones, nulls, shadow and hidden,
new implementation of segm read strp to not only read triangles,
needs to be included in the buffer fill function/draw function
2016-11-16 14:00:51 +01:00
Anakin 806024f4f9 faster method for texture handling 2016-11-13 15:46:52 +01:00
Anakin 0f379ba04a ignore null, bones, shadow mesh and hidden things 2016-11-13 12:47:19 +01:00
Anakin 8929717c9f handle clustered models 2016-11-13 12:15:33 +01:00
Anakin bbe657d030 reset view before loading a new file,
reset view when pressing space
2016-11-12 13:53:49 +01:00
Anakin 1ab385475b new release version,
Features:
- drag and drop
2016-11-12 12:30:54 +01:00
Anakin 9298d88260 cleaning up before loading new stuff,
next step: calculate best first view position
2016-11-12 12:17:46 +01:00
Anakin 91b65bf6e3 added drag n drop function,
need to clean up before loading the next mesh
2016-11-12 12:14:45 +01:00
Anakin b4bd314450 clean up code 2016-11-12 12:05:03 +01:00
Anakin 2524971d19 include all parent modelmatrices 2016-11-12 11:54:44 +01:00
Anakin 15743e11fa new release version 2016-11-09 17:49:02 +01:00
Anakin 6107b648f9 now every model is painted with it's own texture 2016-11-09 17:48:28 +01:00
Anakin ee8989b098 update README.md,
Cip hat nur OpenGl 2.1 -.-
2016-11-09 14:02:57 +01:00
Anakin 2f83d37e12 fixed the problem,
next solve texture name is taken only from the first element,
move some code around
2016-11-08 21:28:24 +01:00
Anakin b4b2538ea6 fixed problem 2016-11-08 17:06:50 +01:00
Anakin e5490b9451 collect all texture data and give it to the shader later,
solid color works,
texture crash
2016-11-08 16:42:05 +01:00
Anakin 9c7691df85 removed unused variables 2016-11-08 10:31:34 +01:00
Anakin 0fd3a7f9c8 next step: draw each model with it's own texture,
added new example mesh
2016-11-08 10:25:10 +01:00
Anakin b9903e593b new release build 2016-11-07 17:11:02 +01:00
Anakin 3d545b4e75 added a new test mesh,
there are warnings if there is no texture,
2016-11-07 17:08:46 +01:00
Anakin 42c94f290c instance was not the right thing for me,
now it's working
2016-11-07 17:07:16 +01:00
Anakin de76f7182a still trying to fix the problem 2016-11-07 16:00:57 +01:00
Anakin 04d8c453f3 fdsgds<gv<df 2016-11-07 12:16:39 +01:00
Anakin ed66d77b69 still trying to draw instanced 2016-11-07 12:06:55 +01:00
Anakin 8a36fe10b1 allocate memory for the buffer before using it 2016-11-05 13:36:28 +01:00
Anakin 1cbc9336fe fixing some problems,
trying to draw instanced,
now it crashes
2016-11-05 11:53:49 +01:00
Anakin 9c12598bf5 trying to give MVP via buffer,
nothing displayed -.-
2016-11-03 19:46:36 +01:00
Anakin 3af886450f special thanks to john_connor for finding the display problem 2016-11-01 17:07:07 +01:00
Anakin bc518f58ee now you can set optional ogl version through the first 2 parameters 2016-11-01 14:16:18 +01:00
Anakin 9d35634c0c pass data (xyz, uv) with 1 buffer to shader,
bugs:
2 triangles are not painted, one is wrong positioned
2016-11-01 11:51:04 +01:00
Anakin a875820f48 removed unused files,
removed unused functions,
removed unused variables,
reduced dynamic stack memory (there was too much allocated),
moved some code around into better place,
implemented destructor (there is still a std::_face_node left on the stack when the program is done),
2016-10-31 16:19:12 +01:00
Anakin ea07ead94f added new test mesh that is rotated,
translation from model is now applied,
still need to draw all modl from one mesh
2016-10-31 10:46:41 +01:00
Anakin e509b1e11c display all models from a mesh,
problem, apply different model matrices for each model,
solution give a list of all models to ogl controller, where they are handled,
next steps: find solution for wrong rotation + draw ALL models instead of only the first
2016-10-30 14:22:08 +01:00
Anakin a8bfacfd73 fixed wrong placed triangles,
updated release exe
2016-10-23 16:24:36 +02:00
Anakin 5cec0128cd draw all triangles instead of the first 12,
added todo section to the README.md,
clean up code
2016-10-23 16:01:06 +02:00
Anakin 6d5489a96c texture now is correctly displayed 2016-10-23 15:38:47 +02:00
Anakin 4f52510ff9 texture is now correctly detected and used,
there seams to be a problem with the UV. They are not correctly
2016-10-22 15:35:06 +02:00
Anakin be97fa8e6f fixed crash problem 2016-10-22 14:05:46 +02:00
Anakin c0a84c7513 get all materials,
save the texture name for every modl,
program crashes at glfwPollEvents(); fix???
2016-10-22 13:49:45 +02:00
Anakin 03553616e7 now the tool finds the msh2 chunk even if it is not the 2nd behind HEDR,
hence restructured code,
2016-10-21 19:24:30 +02:00
Anakin 211b406c3d dynamical decide whether to use the given texture or solid red 2016-10-21 18:56:34 +02:00
Anakin c3d73895c7 read msh in,
handle non UVed msh,
next test UVed msh + dynamical switch between UVed/not UVed
2016-10-17 17:49:44 +02:00
Anakin e583c361ec fasten code,
fixed vertex crash,
still crashes while getting UV data,
vertex are not displayed correctly
2016-10-16 16:50:20 +02:00
Anakin 9700638548 integrated mesh import class into OpenGL,
Problem with STRP, indices are not logical
2016-10-16 12:33:25 +02:00
Anakin b2f174d15f clean up code:
removed useless variables,
moved code into new functions
2016-10-12 15:55:36 +02:00
Anakin 548150f33e evaluate most of MODL chunk,
missing GEOM chunk,
2016-10-11 13:41:24 +02:00
Anakin 59446f088f now all MODL chunks from MSH2 are saved,
searching only subchunks and not all behind,
finding corrupted size information and trying to continue
2016-10-10 12:34:01 +02:00
Anakin 4f1ff65f71 first try to get all MODL and their sub chunks, 2016-10-09 16:44:35 +02:00
Anakin 443675aeaa save name, size and position of every chunk under MSH2 2016-09-13 19:48:27 +02:00
Anakin 05b6e4f9ed started msh read in 2016-09-12 16:49:05 +02:00
Anakin 663bb62098 added stable test release,
modified dummy uv
2016-09-08 19:00:56 +02:00
Anakin 8955fc91ea OpenGLController: moved some code around
shader: throw errors
2016-09-08 17:41:26 +02:00
Anakin d97a917a5e rle files are now supported 2016-09-08 15:55:12 +02:00
Anakin 11a8de82d4 fixed interaction bug 2016-09-08 11:36:57 +02:00
Anakin ee73c16e1f implemented destructor,
bug: callback does not modify the right oglcontroller
2016-09-08 11:30:00 +02:00
Anakin f57614fd2a added old working project 2016-09-07 17:17:17 +02:00
Anakin 07bf3f9394 fix display bug,
bugs: cannot move cube anymore
2016-09-07 17:12:27 +02:00
Anakin 57472da352 put everything into one class,
Bug: still nothing displayed
2016-09-07 16:07:56 +02:00