Commit graph

85 commits

Author SHA1 Message Date
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