Commit graph

237 commits

Author SHA1 Message Date
Jeremie Roy
65b08cc523 Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master'
Conflicts:
	examples/common/font/text_buffer_manager.cpp
2013-05-22 17:22:48 +02:00
Jeremie Roy
3df72de750 refactor sdf sample completely to show a big scrollable, rotable and scalable text 2013-05-22 17:20:23 +02:00
Jeremie Roy
748e2e395f add typewriter font and sherlock holmes text 2013-05-22 17:19:26 +02:00
Jeremie Roy
f1042b3f6f add Text metrics helper 2013-05-22 17:16:11 +02:00
Jeremie Roy
60e51ea707 make sure pen position always refers to top left + remove measureText + append substring 2013-05-22 17:15:58 +02:00
Jeremie Roy
c13e53153f add max advance to fontInfo 2013-05-22 17:13:17 +02:00
bkaradzic
aeb414d238 Fixed 64-bit warnings. 2013-05-21 21:58:24 -07:00
Jeremie Roy
292b021e0e add functionality to measure text without rendering it 2013-05-21 14:45:14 +02:00
bkaradzic
383efbed99 Fixed shader to output alpha 1.0. 2013-05-20 20:45:22 -07:00
bkaradzic
0f3a4768ba Updated 02-metaballs to demonstrate use of embedded shaders. 2013-05-20 20:10:52 -07:00
bkaradzic
37f4bedeb8 Added vsync to lod example. 2013-05-18 23:10:33 -07:00
bkaradzic
6752a421a2 Fixed LOD shader. 2013-05-18 22:55:43 -07:00
bkaradzic
bed490bd53 Cleanup. 2013-05-18 22:12:40 -07:00
bkaradzic
065ab46822 Cleanup. 2013-05-18 09:43:57 -07:00
bkaradzic
71fb00a298 Updated 12-lod. 2013-05-18 09:34:36 -07:00
bkaradzic
33b52a3cea Merge branch 'master' of github.com:bkaradzic/bgfx 2013-05-18 09:15:51 -07:00
Milos Tosic
e0c53df020 Add LOD transition example 2013-05-18 18:41:32 +08:00
bkaradzic
816efcd934 Removed unused member variables. 2013-05-17 23:06:08 -07:00
bkaradzic
c487afa8ef Added varying.def to dependencies. 2013-05-17 22:13:32 -07:00
Jeremie Roy
700c263042 fix issue with uv packing (and mingw issue) 2013-05-18 00:11:54 +02:00
Jeremie Roy
be925b64c4 remove "m_" from POD struct members in cube_atlas 2013-05-17 23:47:08 +02:00
Jeremie Roy
565d0ca543 add missing functionality to show an atlas face 2013-05-17 23:42:59 +02:00
Jeremie Roy
d7a53cd25f with issue with uv packing of face 2013-05-17 23:42:38 +02:00
bkaradzic
9c0b5be6d7 Added vsync by default to font examples. 2013-05-17 08:45:12 -07:00
bkaradzic
4319f8f1df Fixed MinGW compile error. 2013-05-16 23:45:37 -07:00
bkaradzic
7eef7f52be More cleanup. 2013-05-16 22:03:57 -07:00
bkaradzic
2ab5b6e166 Cleanup. 2013-05-16 20:54:25 -07:00
bkaradzic
274a5f2321 Cleanup. 2013-05-16 20:37:54 -07:00
bkaradzic
50a92db146 Cleanup. 2013-05-16 20:35:08 -07:00
bkaradzic
6cd9a19589 Added screenshots for example 10 and 11. 2013-05-16 20:09:52 -07:00
bkaradzic
374ea5cd71 Removed unused files. Added font asset info to README. 2013-05-16 09:10:43 -07:00
bkaradzic
7fcda61d90 Fixed Linux build. 2013-05-16 09:03:56 -07:00
bkaradzic
45e14926d2 Fixed GCC warnings. 2013-05-15 21:35:26 -07:00
bkaradzic
88162a78cc Nuked Emscripten. 2013-05-15 19:53:19 -07:00
bkaradzic
9dfe1421d8 Fixed GCC warnings. Cleanup. 2013-05-15 19:42:39 -07:00
Jeremie Roy
c4b4b15e37 uncrustify whole font code 2013-05-15 15:21:23 +02:00
Jeremie Roy
61305ed0e4 fix warning and remove useless includes 2013-05-15 15:12:25 +02:00
Jeremie Roy
a4006cf0ab harmonize license header text 2013-05-15 15:07:04 +02:00
Jeremie Roy
1194e6f556 get rid of missleading NULL initializer 2013-05-15 15:02:25 +02:00
Jeremie Roy
fe41a9f6b8 convert pragma once to include guards 2013-05-15 15:01:46 +02:00
Jeremie Roy
def7541538 Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master' 2013-05-15 14:50:54 +02:00
bkaradzic
3601c74e92 Fixed reset flag in examples. 2013-05-08 22:57:54 -07:00
Jeremie Roy
cf895eb5ba remove m_ from POD struct + clean 3rdparty include 2013-05-09 00:49:01 +02:00
Jeremie Roy
925e0eb371 remove blank space 2013-05-09 00:05:45 +02:00
Jeremie Roy
2f89ab16ba rework the samples 2013-05-08 23:55:54 +02:00
Jeremie Roy
b2e506d7aa better font sample 2013-05-08 19:55:20 +02:00
Jeremie Roy
d1a128d62a remove compiled shaders in favor of embedded one 2013-05-08 19:54:33 +02:00
Jeremie Roy
4ca2b3f4af move shaders to embedded shader system 2013-05-08 19:53:47 +02:00
Jeremie Roy
043a062346 fix bug of bleeding styled text 2013-05-08 19:53:21 +02:00
Jeremie Roy
a69a483de3 Add some fonts to display text 2013-05-08 19:52:47 +02:00
Jeremie Roy
d63a452161 commit embedded shaders 2013-05-08 19:46:51 +02:00
Jeremie Roy
67ebcebd21 add inner outline in order to avoid texture bleeding 2013-05-08 19:45:58 +02:00
bkaradzic
528360ac6c Fixed path separator. 2013-05-07 22:37:19 -07:00
Jeremie Roy
88e6ce0a33 Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master' 2013-05-07 17:01:37 +02:00
Jeremie Roy
6cf5f67eae load shaders explicitely inside the samples 2013-05-07 15:51:19 +02:00
Jeremie Roy
d470ac2567 remove explicit filesystem dependency 2013-05-07 14:26:49 +02:00
Jeremie Roy
e4712b2641 use embedded shaders 2013-05-07 14:26:31 +02:00
bkaradzic
7f2edf4861 Initialize mouse button state. 2013-05-03 09:18:53 -07:00
bkaradzic
468b48b017 Removed bad check for clear flags. 2013-04-30 23:10:29 -07:00
bkaradzic
0e0fcd22de Removed use of external debug functions. 2013-04-28 12:27:35 -07:00
bkaradzic
fb7fd32f24 Run all samples with vsync on by default. 2013-04-27 18:47:18 -07:00
bkaradzic
2ef508139f GL/GLES: vsync. 2013-04-27 15:16:05 -07:00
bkaradzic
3686725fef Fixing update time. 2013-04-27 12:43:18 -07:00
bkaradzic
9780828b98 Fixing update time. 2013-04-27 00:11:23 -07:00
bkaradzic
52079f1d49 Removed time offset from bx. Let app #dealwithit. 2013-04-25 23:30:56 -07:00
bkaradzic
047eca5829 Cleanup. 2013-04-24 23:42:20 -07:00
bkaradzic
6403d9b5a6 Fixed GCC warnings. 2013-04-24 22:03:04 -07:00
bkaradzic
872b25b447 Added imgui parameter tweaker to HDR example. 2013-04-24 21:40:54 -07:00
bkaradzic
6e374982be Added imgui. 2013-04-24 21:01:11 -07:00
bkaradzic
375d4b821b Added droidsans.ttf font to examples/runtime. 2013-04-24 19:24:08 -07:00
Jeremie Roy
b661d50b69 Fix bug involving assert a function call. 2013-04-24 12:23:47 +02:00
Jeremie Roy
fc5f5d3ec2 convert static const to #define 2013-04-24 12:15:40 +02:00
Jeremie Roy
83f176a5dc convert m_u_xxx to u_xxx for uniforms handle naming. 2013-04-24 12:10:41 +02:00
Jeremie Roy
1a1b4a9baf Better disable warning for Freetype 2013-04-24 12:07:47 +02:00
Jeremie Roy
d4a695a181 convert assert to BX_CHECK 2013-04-23 23:14:32 +02:00
Jeremie Roy
1d5c813806 remove Sleep() in demo function 2013-04-23 22:51:59 +02:00
Jeremie Roy
119317686c use ii instead of i in for loop 2013-04-23 22:48:34 +02:00
Jeremie Roy
5096f82d12 convert size_t to uint32_t and int to int32 2013-04-23 22:32:39 +02:00
Jeremie Roy
e851f5dec6 update text_buffer_manager to bgfx naming style 2013-04-23 21:49:24 +02:00
Jeremie Roy
6c956ee0c9 update font_manager to bgfx coding style 2013-04-23 20:58:57 +02:00
Jeremie Roy
6b8b95acd8 update cube_atlas to bgfx naming style 2013-04-23 20:36:07 +02:00
Jeremie Roy
1f5db2d7db fix typo in debug text 2013-04-23 17:23:00 +02:00
Jeremie Roy
3156a79257 fix a typo in fontsdf name 2013-04-23 17:22:19 +02:00
Jeremie Roy
7f3fb10f2a Remove namespace from font utility classes 2013-04-23 17:18:54 +02:00
Jeremie Roy
1f44b65ef6 proper debug text message in fontdfs 2013-04-23 14:32:31 +02:00
Jeremie Roy
7f6d441c27 add proper debug comment in the font sample using the text system (good demonstration) 2013-04-23 14:29:35 +02:00
Jeremie Roy
8ddda84cd7 restore pen position (did break it for debug previously) 2013-04-23 14:28:31 +02:00
Jeremie Roy
253d07435c rename font samples main cpp to the project name 2013-04-23 14:10:53 +02:00
Jeremie Roy
62c9a457c1 rename samples to shorter name 2013-04-23 14:09:45 +02:00
Jeremie Roy
7c7612a971 integration of font and text system 2013-04-22 22:42:11 +02:00
bkaradzic
dae6768c43 Fixed detection of instanced_array extension. 2013-04-20 23:13:44 -07:00
bkaradzic
ba55084ad8 Android wip. 2013-04-18 23:32:12 -07:00
bkaradzic
767df6c5e6 Android plumbing. 2013-04-18 21:16:09 -07:00
bkaradzic
d3a526a92b Android build fixes wip. 2013-04-15 23:10:32 -07:00
bkaradzic
6f13e31d2b Fixed warning. 2013-04-13 11:38:51 -07:00
bkaradzic
05a18ab5cf Added QNX entry. 2013-04-13 01:54:17 -07:00
bkaradzic
507af8c9f1 Fixed shaderc crash when $in/output lines have comments. 2013-04-11 20:36:28 -07:00
bkaradzic
4ab0874d53 Changed u_model uniform to array. 2013-04-06 14:16:38 -07:00
bkaradzic
648c8a593e Fixed GLES2 texture format error. Fixed hdr example cube texture issue. 2013-04-06 14:03:38 -07:00
bkaradzic
84bfec136a Removed some HLSL intrinsic from .sc shaders in favor of GLSL. Fixed varying.def parsing. 2013-04-05 20:40:50 -07:00