Commit graph

187 commits

Author SHA1 Message Date
Mikulas Florek
a5265d3c7e renderer performance optimization 2014-09-07 01:10:24 +02:00
Mikulas Florek
161d7c828e image preview in the property view 2014-08-24 16:47:26 +02:00
Mikulas Florek
30be77957b world matrix in shader is set for each object 2014-08-19 22:41:20 +02:00
Mikulas Florek
5f996c1bef undo/redo - closes #13 2014-08-16 22:44:44 +02:00
Mikulas Florek
efe647031d alpha to coverage in the material editor; all of the grass is rendered 2014-08-11 00:15:48 +02:00
Mikulas Florek
defb3ca094 hit count displayed in the profiler UI 2014-08-10 23:40:22 +02:00
Mikulas Florek
037eab143c alpha to coverage setting in a material 2014-08-10 23:17:31 +02:00
Mikulas Florek
ca11b26c12 update according to review 2014-08-10 21:20:46 +02:00
Mikulas Florek
22886270e4 multisampled grass 2014-08-10 17:20:32 +02:00
Mikulas Florek
3e6b12072d grass optimization; grass mesh as terrain's property 2014-08-10 13:10:56 +02:00
Mikulas Florek
3bd5fb7921 grass inherit terrain's layer 2014-08-09 20:15:38 +02:00
Mikulas Florek
a5b62d4291 grass WIP 2014-08-09 14:37:23 +02:00
Mikulas Florek
92b248acd5 EditorClient removed 2014-07-31 23:45:57 +02:00
Mikulas Florek
5002eccaeb terrain refactored 2014-07-20 00:45:57 +02:00
Mikulas Florek
11acbfc710 update according to review 2014-07-18 21:50:28 +02:00
Mikulas Florek
8c6b9a15b9 shadow matrices are sent to the terrain shader 2014-07-15 22:38:36 +02:00
Mikulas Florek
7ef1994c61 toggle wifreame in editor 2014-07-13 16:54:09 +02:00
Mikulas Florek
bd825c6e9d terrain - y scale; scale is saved 2014-07-09 21:33:35 +02:00
Mikulas Florek
c57d7b6b86 proper terrain LODs when a terrain is scaled 2014-07-09 21:09:18 +02:00
Mikulas Florek
e374fdf31e terrain xz scale 2014-07-09 20:50:19 +02:00
Mikulas Florek
f6e1edc918 16bit opengl textures; light_dir is sent to the terrain shader 2014-07-09 19:52:10 +02:00
Mikulas Florek
cf94e96644 terrain rendering refactored 2014-07-08 22:31:01 +02:00
Mikulas Florek
c738c7229f terrain lod - working prototype - very ugly coded 2014-07-07 23:37:40 +02:00
Mikulas Florek
53a004c828 terrain lod - WIP 2014-07-05 17:24:12 +02:00
Mikulas Florek
dd546c451f strcpy and strcat replaced 2014-06-29 13:09:10 +02:00
Mikulas Florek
bd201a9668 type safe logger 2014-06-29 11:45:32 +02:00
Mikulas Florek
219979d8e3 lux->lumix 2014-06-25 23:20:33 +02:00
Mikulas Florek
47175b2a64 timer in scene accessible from shader 2014-06-21 19:26:27 +02:00
Mikulas Florek
1054749379 lux -> lumix 2014-06-16 21:18:15 +02:00
Mikulas Florek
3af0a7da6d physical heightfield - WIP 2014-06-08 17:46:46 +02:00
Mikulas Florek
31999a0e67 merge from trunk 2014-06-08 11:32:34 +02:00
Mikulas Florek
d3cb160b57 terrain prototype 2014-06-03 21:46:34 +02:00
Mikulas Florek
8f67fb71b7 memory leaks fixed 2014-06-03 18:16:51 +02:00
Mikulas Florek
517afeec42 pipeline custom command 2014-06-03 16:43:35 +02:00
Mikulas Florek
7fa9b2b556 debug line lifetime fixed; physx debug render 2014-06-02 21:09:12 +02:00
Mikulas Florek
3e3f6c37c3 several crashes fixed - closes #154, closes #184 2014-05-26 00:25:59 +02:00
Mikulas Florek
93837acabf several crashes fixed 2014-05-24 14:02:50 +02:00
Mikulas Florek
6ebab3193f warnings fixed 2014-05-21 21:57:15 +02:00
tluqo
a2f0653f27 Merge remote-tracking branch 'remotes/origin/master' into Resource_Manager
Conflicts:
	qteditor/QtEditor/materialmanager.cpp
	qteditor/QtEditor/ui_camerawidget.h
	qteditor/QtEditor/ui_mainwindow.h
	src/graphics/model_instance.cpp
	src/graphics/pipeline.cpp
2014-05-21 20:16:57 +02:00
tluqo
b3f07e6723 fixes #176 2014-05-20 23:35:09 +02:00
Mikulas Florek
c53a9fe395 merge from master 2014-05-20 22:09:06 +02:00
Mikulas Florek
78d6f7a698 server memory leaks fixed 2014-05-19 00:00:33 +02:00
Mikulas Florek
f162ddcf73 imrpoved shadow - WIP 2014-05-17 19:33:38 +02:00
Mikulas Florek
2a2d9ce77d system for rendering debug lines 2014-05-17 15:44:52 +02:00
Mikulas Florek
bc7df53a47 merge from master 2014-05-07 23:43:05 +02:00
tluqo
25b6776cad - fixes memory leaks
- fixes #160
2014-05-03 22:29:09 +02:00
Mikulas Florek
1296e634c1 render scenes 2014-04-30 20:02:08 +02:00
Mikulas Florek
3892856473 fixed rendering when there is not light 2014-04-21 23:03:40 +02:00
Mikulas Florek
2276e08074 framebuffers have name 2014-04-19 14:57:21 +02:00
Mikulas Florek
6805c614bc light direction send to fragment shader 2014-04-18 22:10:16 +02:00
Mikulas Florek
f0d1dbfd04 shader reloading fixed 2014-04-18 21:32:25 +02:00
Mikulas Florek
0a0eb379ae more dynamic shader uniform system 2014-04-18 13:33:02 +02:00
Mikulas Florek
ee436eaf20 improved deserialization - dynamic object properties 2014-04-16 19:57:09 +02:00
Mikulas Florek
f9d6dbadc3 merge from master 2014-04-15 22:21:47 +02:00
tluqo
94ecfc02ae applied review comments. 2014-04-14 22:20:44 +02:00
Mikulas Florek
8acb52c254 glew 2014-04-14 00:36:19 +02:00
Mikulas Florek
cb37ba0c25 camera is properly set when an universe is loaded 2014-04-13 22:32:20 +02:00
Mikulas Florek
f54dbeb4af improved camera system; renderer deserialization is fixed 2014-04-11 23:53:30 +02:00
Mikulas Florek
89e06bba31 level 4 warnings fixed in engine project 2014-04-09 23:59:39 +02:00
Mikulas Florek
0bd87f01e5 level 4 warnings 2014-04-09 23:39:16 +02:00
Mikulas Florek
ddbd1f86a1 animation and pipeline unload 2014-04-07 21:36:24 +02:00
Mikulas Florek
8d77b776ed merge fixed 2014-04-07 21:18:16 +02:00
Mikulas Florek
40083399cb merged master 2014-04-07 21:15:36 +02:00
tluqo
34ac29b009 - animation manager + unit tests 2014-04-06 16:59:18 +02:00
tluqo
8cfef76674 - pipeline manager
- unit test: material manager
- several fixes in the unit test suite
2014-04-05 22:54:29 +02:00
Mikulas Florek
b62e5424b2 renderable layers - at the moment used only to show gizmo behind objects 2014-04-04 01:03:15 +02:00
Mikulas Florek
d7fdf81d9e removed macros for c++11 features; gizmo scaling 2014-04-03 23:59:36 +02:00
Mikulas Florek
3751577874 shadows fixed 2014-03-30 11:36:36 +02:00
Mikulas Florek
46d00d796f The old editor is removed; Pipeline instances 2014-03-30 11:11:50 +02:00
Mikulas Florek
62318dc039 getLookAtMatrix fixed 2014-03-27 23:43:55 +01:00
Mikulas Florek
16a8c5a5db editor messages are not processed in the receiving thread; object can be selected using the icon; new renderer can be (de)serialized; other minor fixes 2014-03-27 22:53:25 +01:00
Mikulas Florek
a4051bfe3c resize cameras in pipeline 2014-03-23 11:42:00 +01:00
Mikulas Florek
7105b9174a c++11 2014-03-16 14:33:45 +01:00
Mikulas Florek
f2c5e68415 update according to code review 2014-03-16 13:11:23 +01:00
Mikulas Florek
f45f563906 merge from master 2014-03-16 12:29:34 +01:00
Mikulas Florek
702a390cd8 pipeline commands refactored 2014-03-14 22:45:39 +01:00
Mikulas Florek
1c73b8e9b4 vs 2013 2014-03-14 00:04:57 +01:00
Mikulas Florek
1e4af35f1b shadows - proof of concept 2014-03-12 23:00:16 +01:00
tluqo
932ed1d97a - fixed some TODO: close file somehow 2014-03-04 22:23:53 +01:00
Mikulas Florek
1d93d14b64 raycasting in renderer is fixed; partially functioning gizmo 2014-02-25 23:05:13 +01:00
Mikulas Florek
68ea5b036b animated meshes are properly rendered 2014-02-22 13:31:16 +01:00
Mikulas Florek
6b70857e64 new renderer: animation WIP 2014-02-09 23:43:10 +01:00
Mikulas Florek
331af882de new renderer: gui rendering fixed, camera movement, getRay 2014-02-07 23:07:42 +01:00
Mikulas Florek
58e68772b9 shader loading 2014-02-04 22:19:49 +01:00
Mikulas Florek
202b4b9b61 material and texture loading 2014-02-03 23:27:29 +01:00
Mikulas Florek
aad5b1ba81 new_renderer : simple geometry 2014-01-25 14:56:39 +01:00
Mikulas Florek
32f91f8c47 first new renderer commit 2014-01-24 18:13:50 +01:00