mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,840 Commits 2 Branches 0 Tags 518 MiB
master
Commit Graph

1335 Commits

Author SHA1 Message Date
Leandro Freire
1db46f4fe6 Rename variables and constants 2019-08-17 12:32:16 -07:00
Бранимир Караџић
2814ee8bb7 Fixed openUrl. 2019-08-16 07:05:01 -07:00
attilaz
75d5662f0b Metal: added support for binding buffers to vertex/fragment shader stages 
I have removed the SamplerInfo workaround, because new shaderc preserves texture stages. Some shaders needed recompile with latest shaderc to get the new behavior.
 2019-08-16 06:58:44 -07:00
Бранимир Караџић
1768ace0f7 Cleanup. 2019-08-14 22:31:32 -07:00
Бранимир Караџић
7b01a4dc9a Cleanup. 2019-08-14 22:21:29 -07:00
Бранимир Караџић
70d460bf32 Fixed build. 2019-08-14 21:46:50 -07:00
Бранимир Караџић
a5898b131b examples: Added documentation link. 2019-08-14 21:19:03 -07:00
Leandro Freire
855623e153 Rename VertexDecl to VertexLayout 2019-08-13 18:42:01 -07:00
Бранимир Караџић
73362c3989 Rebuilt shaders. 2019-08-10 10:26:00 -07:00
Rinthel Kwon
6927a9179b vulkan renderer draft implementation 2019-08-04 19:51:16 -07:00
Martijn Courteaux
6c6f43cff0 Fixed gather after cleanup in 49bd00e. 2019-08-04 16:58:25 -07:00
Paul Gruenbacher
ccc48c96a2 fix dialog null terminator (#1835) 2019-07-27 19:26:48 -07:00
Бранимир Караџић
d7d74c19c6 Cleanup. 2019-07-17 21:45:17 -07:00
Brian Richardson
650c1733be Tweak fs_font_basic shader to work on Raspberry Pi 3. (#1803) 
DX shaders not updated because I'm not on Windows.
 2019-07-12 21:53:12 -07:00
Vladimir Vukicevic
6838719246 Remove printf in entry_asmjs that requires stdio.h 2019-07-02 01:24:15 +00:00
Andy Duplain
26c2aa0e2d Fix compilation of example entry_winrt.cx on VS2017. 2019-05-31 12:15:49 +01:00
Cloud Wu
af31aaaa4c AddInputCharacter can handle Unicode 2019-05-10 16:05:32 +08:00
Бранимир Караџић
8c35cc2dea Cleanup. 2019-05-09 20:06:24 -07:00
Cloud Wu
0c6ea27310 Use W APIs only necessary 2019-05-09 09:32:14 +08:00
Cloud Wu
65aa58aab1 UTF-8 support for windows entry 2019-05-08 17:31:20 +08:00
Cloud Wu
676ceb1a2d unicode inputChar support for imguiBeginFrame 2019-05-06 20:34:13 +08:00
Бранимир Караџић
22ca1ce1a2 Fixed Linux build. 2019-04-29 20:52:39 -07:00
Attila Kocsis
f3105c7e59 OSX entry changes 
- exit fix
- using native fullscreen support instead of borderless window
 2019-04-28 18:19:19 +02:00
Attila Kocsis
bcd1375762 Handling left/right modifiers separately 2019-04-27 21:06:44 +02:00
Бранимир Караџић
2747c75e0a Cleanup. 2019-04-26 19:33:32 -07:00
Бранимир Караџић
fcfc26c482
Merge pull request #1743 from attilaz/filedialog 
File dialog added to entry
 2019-04-25 18:57:21 -07:00
Attila Kocsis
62f54bb7ad File dialog added to entry 
Win32/Linux version is from texturev. OSX uses native dialog instead of zenity.
win32 has a fix to support win32 target:  OPENFILENAMEA customData is uintptr_t instead of uint64_t.
 2019-04-25 22:29:34 +02:00
Nikolaos Patsiouras
28f4f99afe * Fixed obsucre crash when bar width is equal to max width. 2019-04-25 22:29:06 +03:00
Attila Kocsis
04d532e085 14-shadowvolumes uses common mesh loader 2019-04-23 18:20:10 +02:00
Бранимир Караџић
c927f474d5 Cleanup. 2019-04-16 20:07:42 -07:00
Бранимир Караџић
1198f73af1 Removed Scintilla. 2019-04-16 19:16:09 -07:00
Бранимир Караџић
5ad11a80ab Cleanup. 2019-04-13 07:51:25 -07:00
attilaz
ed885c3c5a using meshoptimizer for vertex cache/fetch optim and index/vertex buffer compression 2019-04-13 16:07:06 +02:00
iAn
c5aee70d0d omit the loadTexture variety while changing flags type 2019-03-24 14:06:58 +08:00
iAn
55bdb715d0 loadTex support 'BGFX_TEXTURE_*' flags for creating texture 2019-03-24 13:49:42 +08:00
Бранимир Караџић
9f7c3281e1 Added NVN stub. 2019-03-12 17:01:02 -07:00
Бранимир Караџић
308a54c9c6
Merge pull request #1683 from BlockoS/master 
Renamed BGFX_USE_WAYLAND to ENTRY_CONFIG_USE_WAYLAND.
 2019-03-09 08:23:27 -08:00
mooz
ff13e730bb Renamed BGFX_USE_WAYLAND to ENTRY_CONFIG_USE_WAYLAND. 2019-03-09 10:53:14 +01:00
Бранимир Караџић
ac8a686f6e Fixed issue #1681. 2019-03-08 07:53:15 -08:00
Бранимир Караџић
a6bdbd4a03
Merge pull request #1679 from BlockoS/master 
Add Wayland support to SDL and GLFW entry backends.
 2019-03-08 07:31:40 -08:00
mooz
2b6d4cf00f Added Wayland support. 2019-03-08 10:36:50 +01:00
Attila Kocsis
8196612195 Fixed osx multiple window create/destroy 2019-03-07 19:54:03 +01:00
Бранимир Караџић
53fe0138f0 Cleanup. 2019-03-03 15:17:09 -08:00
Бранимир Караџић
0b921ea8e4 Fixed issue #1668. 2019-02-27 09:20:37 -08:00
Бранимир Караџић
3d7a8e904c Cleanup. 2019-02-19 17:53:03 -08:00
Бранимир Караџић
f02169a4b4 Cleanup. 2019-02-17 21:48:20 -08:00
Бранимир Караџић
ef39f514de Adding more bounds overlap tests. 2019-02-14 14:48:45 -08:00
Бранимир Караџић
235cab52c2 Cleanup. 2019-02-12 22:49:20 -08:00
Бранимир Караџић
54e5493f04 Fixed closestPoint to OBB. 2019-02-12 20:12:12 -08:00
Бранимир Караџић
7464fd16ab Cleanup. 2019-02-11 16:54:53 -08:00
Бранимир Караџић
cc508d4520 Cleanup. 2019-02-11 16:50:56 -08:00
Бранимир Караџић
65250881a1 Cleanup. 2019-02-11 16:49:11 -08:00
Бранимир Караџић
4d6da5473a Adding more bounds overlap tests. 2019-02-11 15:59:24 -08:00
Бранимир Караџић
604f275d61 Cleanup. 2019-02-10 21:08:44 -08:00
Бранимир Караџић
0dce0d0fd3 Adding more bounds overlap tests. 2019-02-10 17:59:27 -08:00
Бранимир Караџић
41585e6ffc Cleanup. 2019-02-09 22:09:25 -08:00
Бранимир Караџић
aee7e381e0 Cleanup. 2019-02-09 21:48:11 -08:00
Бранимир Караџић
567c7c097f Adding more bounds overlap tests. 2019-02-09 21:22:45 -08:00
Бранимир Караџић
f993167026 Cleanup. 2019-02-09 13:37:22 -08:00
Бранимир Караџић
29e978ea91 Cleanup. 2019-02-06 23:10:01 -08:00
Бранимир Караџић
cefce11fe4 Adding more bounds overlap tests. 2019-02-05 23:09:57 -08:00
Бранимир Караџић
3118ccfc07 Cleanup. 2019-02-05 21:10:48 -08:00
Бранимир Караџић
f19491c274 Adding more bounds overlap tests. 2019-02-05 19:42:48 -08:00
Бранимир Караџић
d0146fdfbb Cleanup. 2019-02-05 18:52:00 -08:00
Бранимир Караџић
0fda843a7c Cleanup. 2019-02-05 18:39:00 -08:00
Бранимир Караџић
649033599b Adding more bounds overlap tests. 2019-02-05 18:31:42 -08:00
Бранимир Караџић
c0aff1f466 Adding more bounds overlap tests. 2019-02-04 22:01:56 -08:00
Бранимир Караџић
a91b4bb4c8 Cleanup. 2019-02-04 21:40:03 -08:00
Бранимир Караџић
82c5c138b0 Adding more bounds overlap tests. 2019-02-04 21:08:08 -08:00
Бранимир Караџић
a235f8028f Cleanup. 2019-02-03 23:19:04 -08:00
Бранимир Караџић
70d3888b97 More overlap tests. 2019-02-03 22:07:51 -08:00
Бранимир Караџић
f6f6a22119 Adding bounds overlap tests. 2019-02-03 19:47:33 -08:00
Branimir Karadžić
b0f0514f86 Rebuilt embedded shaders. 2019-01-22 21:02:34 -08:00
Бранимир Караџић
a0c2907c22 Added internal debug names for index/vertex buffers, shaders, and textures. 2019-01-22 14:45:33 -08:00
attilaz
5dba3a93af MSL vs/fs shaders use spirv-cross 2019-01-22 22:31:41 +01:00
Бранимир Караџић
0df9a005fa Cleanup. 2019-01-14 19:08:49 -08:00
Бранимир Караџић
3f3a9450ba Happy New Year! 2019-01-13 17:13:25 -08:00
Бранимир Караџић
a54f8a3f81 Renamed UniformType enum Int1 to Sampler. 2019-01-11 14:14:17 -08:00
Attila Kocsis
5cdd4de559 Moved autoreleasepool into renderframe 2019-01-10 20:25:06 +01:00
Бранимир Караџић
9d36479baf Fixed FPS widget. 2019-01-06 21:46:21 -08:00
Бранимир Караџић
9d211e2ee4 Cleanup. 2019-01-06 17:15:56 -08:00
Mathieu-Andre Chiasson
ef3451c0b4 examples now have an FPS histogram, min, max, avg 2019-01-06 19:41:27 -05:00
Бранимир Караџић
bc65303576 Merge branch 'master' of github.com:bkaradzic/bgfx 2019-01-03 22:03:42 -08:00
Бранимир Караџић
d712453609 Cleanup. 2019-01-03 22:03:40 -08:00
Бранимир Караџић
fb8a82a5fd Cleanup. 2019-01-03 14:30:59 -08:00
Mathieu-Andre Chiasson
5be52bb925 upgraded nanovg to the latest. 2018-12-27 21:52:01 -05:00
Branimir Karadžić
147a379067 Cleanup. 2018-12-21 21:05:26 -08:00
Branimir Karadžić
5a996c95d9 Cleanup. 2018-12-21 20:39:31 -08:00
Branimir Karadžić
63e298795d Cleanup. 2018-12-21 18:02:39 -08:00
Branimir Karadžić
0740b29de7 Cleanup. 2018-12-10 19:39:00 -08:00
Attila Kocsis
28c1ffd28f iOS metal fixes 2018-12-09 10:03:21 +01:00
Branimir Karadžić
1a5b892be4 Removing old vector math. 2018-12-06 22:03:47 -08:00
Branimir Karadžić
54c2ccf31e Metal: Moving auto release pool inside renderer. Issue #1269. 2018-12-05 22:08:05 -08:00
Branimir Karadžić
715b512d29 Cleanup. 2018-12-04 18:30:45 -08:00
Branimir Karadžić
610d503d97 OSX: Multiple window support. Manual merge from PR #1563. 2018-11-28 15:19:13 -08:00
Branimir Karadžić
bcfc99d094 Cleanup. 2018-11-25 20:11:03 -08:00
Branimir Karadžić
66a7d6ab05 Removing old vector math. 2018-11-16 21:54:20 -08:00
Branimir Karadžić
b1752bc630 Removing old vector math. 2018-11-16 20:31:57 -08:00
Branimir Karadžić
a1b4cfc06c Switching to new Vec3. 2018-11-13 22:38:41 -08:00
Branimir Karadžić
3794494d3b Fixed static analysis issues from #1535. 2018-10-28 15:34:06 -07:00
Branimir Karadžić
6bff345637 StringView cleanup. 2018-10-21 19:17:44 -07:00
Branimir Karadžić
83b1ece243 Rebuilt shaders. 2018-09-19 20:35:53 -07:00
Branimir Karadžić
2b427d5126 Cleanup. 2018-09-18 17:24:18 -07:00
Branimir Karadžić
be8b8381cc Cleanup. 2018-09-17 20:51:21 -07:00
Branimir Karadžić
96fe6b3d7b debugdraw: Added quad. 2018-09-17 17:25:14 -07:00
Branimir Karadžić
f0772da653 Cleanup. 2018-09-10 17:45:23 -07:00
Branimir Karadžić
b4ab3dd95e debugdraw: Added 32-bit indices. Fixed pop transform. 2018-09-04 17:27:35 -07:00
Branimir Karadžić
4433b5bcdc Separating sampler flags from texture creation flags. 2018-08-20 17:12:26 -07:00
Branimir Karadžić
db0ec1f5db Removed HMD API and OculusVR support. 2018-07-19 20:22:21 -07:00
Branimir Karadžić
d7c5156084 Cleanup. 2018-06-16 08:34:06 -07:00
Branimir Karadžić
2986c1eb7b D3D11/12: Added ASTC formats. 2018-06-11 14:43:17 -07:00
Branimir Karadžić
9da45ed78c Renamed bgfx::updateDynamic* to just bgfx::update. 2018-06-09 17:29:00 -07:00
OswaldHurlem
ff34c8c37d Mouse up/down events from entry_sdl.cpp incorrectly have mouse z (scroll_z) set to zero (#1404) 2018-06-06 21:40:18 -07:00
Branimir Karadžić
8bc501d0a1 debugdraw: Use encoder for transforms. 2018-05-24 18:03:51 -07:00
Branimir Karadžić
0d502588d0 Removed ViewId style from ImGui. 2018-05-09 08:01:29 -07:00
Branimir Karadžić
e74a5d7843 Renamed ocornut-imgui to dear-imgui. 2018-05-06 08:57:48 -07:00
Bill Freist
d6777a8887 Only flush and set the depth test bits if depth is currently enabled already. (#1375) 
This removes a bug where you could blow away the options set in a previous call to setState() which can enabled/disable depth testing.
 2018-04-16 22:04:49 -07:00
Branimir Karadžić
46dcba65e5 debugdraw: Added depth test less to begin. 2018-04-16 17:58:17 -07:00
Branimir Karadžić
0c405fc256 shaderc: Fixed SPIRV uniform offsets. 2018-04-14 10:30:00 -07:00
Branimir Karadžić
45918a4e81 Updated shaders. 2018-04-12 20:45:33 -07:00
Branimir Karadžić
ab46f3f353 Rebuild embedded shaders. 2018-04-11 21:14:22 -07:00
Branimir Karadžić
f3313f825a debugdraw: Added encoder to allow MT submit. 2018-04-11 17:26:55 -07:00
Branimir Karadžić
03b7659b37 debugdraw: Allow use of encoder. 2018-04-10 17:15:24 -07:00
Branimir Karadžić
2bbc67e922 Cleanup. 2018-04-10 08:55:56 -07:00
Branimir Karadžić
f92c6625d9 VK: Cleanup. 2018-04-09 21:09:52 -07:00
Branimir Karadžić
93a1c8171a Cleanup. 2018-04-08 20:12:49 -07:00
Branimir Karadžić
3272efe2f5 Cleanup. 2018-03-28 20:35:37 -07:00
Branimir Karadžić
5ecd605107 Updated shaders. 2018-03-17 21:56:54 -07:00
Branimir Karadžić
b4229e4a17 Cleanup. 2018-03-01 17:30:28 -08:00
Branimir Karadžić
15485134f7 Updated nanovg. 2018-03-01 09:05:54 -08:00
Branimir Karadžić
b08e985508 OSX: Fixed title bar. 2018-02-26 07:55:43 -08:00
Branimir Karadžić
3fbfd16f29 OSX: Fixed warnings. 2018-02-20 13:20:45 -08:00
Branimir Karadžić
3798bb7105 Updated ImGui. 2018-02-16 18:21:19 -08:00
Rico P
01e7b1ccf5 add missing return statement (#1335) 
I had to fix this, because my linker was complaining
 2018-02-16 08:48:27 -08:00
Branimir Karadžić
584b8b34f0 Added support for independent RGB channel write control. 2018-02-13 12:35:23 -08:00
Branimir Karadžić
c6f03ab6a3 Cleanup. 2018-02-06 21:39:50 -08:00
Branimir Karadžić
adfe3b002b Cleanup. 2018-02-06 21:35:36 -08:00
Branimir Karadžić
e8658e7c06 Cleanup. 2018-02-06 21:33:50 -08:00
Branimir Karadžić
f45d010b90 Updated ImGui. 2018-02-06 13:24:05 -08:00
Branimir Karadžić
0190e5543d Cleanup. 2018-02-01 19:38:55 -08:00
knightlyj
9f4260e54d Example bug fixed: ImGui::End() should be called whether ImGui::Begin() return true or false (#1325) 2018-01-31 09:51:27 -08:00
Johan Sköld
76442f2f29 Fixing macOS build. (#1324) 
- Fixing compiler errors from C functions with missing argument lists.
- Silencing warning about -Wunused-but-set-variable being unknown.
- Silencing warnings about comma mis-use.
- Silencing warning about implicit cast from unsigned to int.
 2018-01-30 21:47:27 -08:00
Branimir Karadžić
b781fe4dff Cleanup. 2018-01-27 20:03:37 -08:00
Branimir Karadžić
325dc2a145 Cleanup. 2018-01-25 21:46:35 -08:00
Branimir Karadžić
1a90c93458 Cleanup. 2018-01-17 21:05:14 -08:00
Branimir Karadžić
0d2fc80372 Cleanup. 2018-01-17 17:34:20 -08:00
Branimir Karadžić
49a75f2fb1 bx math API cleanup. 2018-01-13 15:33:50 -08:00
Branimir Karadžić
e38c7bfaec Updated embedded shaders. 2018-01-13 11:55:27 -08:00
Branimir Karadžić
d8643b5b2f Updated ImGui. 2018-01-11 22:10:53 -08:00
Branimir Karadžić
8f6da81bb6 debugdraw: Added support for custom geometry. 2018-01-11 00:14:36 -08:00
Branimir Karadžić
03e84603e8 Cleanup. 2018-01-09 17:14:27 -08:00
XingYi Hu
b2346a04c5 Fix OSX initial window size event. (#1311) 
The height returned by contentRectForFrameRect is not exactly the same as the ENTRY_DEFAULT_HEIGHT if the screen size is not big enough.
For example, on my Mac, rect.height equals 702, which is 18 less than ENTRY_DEFAULT_HEIGHT(720).
This will cause the imgui’s cord system offset by 18, so even the cursor is not on the button, the imgui will still think the mouse is hover the button, also, the top of imgui’s window will also offset a little bit.
However, these symptom will gone when the window is resized.
In short, this fix unify the behavior of window size event in initial state with resize.
 2018-01-09 09:53:50 -08:00
Branimir Karadžić
e77b993a25 debugdraw: Added arbitrary mesh rendering. 2018-01-08 17:54:15 -08:00
Branimir Karadžić
60bd34b520 Fixed issue #1309. 2018-01-08 09:54:34 -08:00
Branimir Karadžić
0093775508 texturev: Added support for drop file. 2018-01-04 13:05:36 -08:00
Branimir Karadžić
37949c91f1 Cleanup. 2018-01-03 23:35:42 -08:00
Branimir Karadžić
8c91699678 entry: Drop file event for SDL. 2018-01-03 22:49:10 -08:00
Branimir Karadžić
d616ed345b entry: Drop file event for GLFW. 2018-01-03 21:58:37 -08:00
Branimir Karadžić
97e6c498a8 entry: Added drop file event WIP. 2018-01-03 21:37:42 -08:00
Branimir Karadžić
49b5c55610 Fixed SDL build. 2018-01-02 21:41:36 -08:00
Branimir Karadžić
ed00c24f6f texturev: Allow arbitrary window size. 2018-01-02 19:15:04 -08:00
Branimir Karadžić
f44c8e2b14 Happy New Year! 2018-01-01 11:16:06 -08:00
Branimir Karadžić
276bff9cb4 Cleanup. 2018-01-01 11:00:24 -08:00
Branimir Karadžić
1763179536 Fixed issue #1302. 2018-01-01 10:54:29 -08:00
Branimir Karadžić
963aa2cac9 D3D12 UWP fixes. 2017-12-16 19:01:56 -08:00
Branimir Karadžić
0a3637fa27 Cleanup. 2017-12-14 20:59:31 -08:00
Branimir Karadžić
f7fea65bec Removed obsolete platforms. 2017-12-14 20:40:30 -08:00
Branimir Karadžić
e69f69e0cd D3D12: Cleanup. 2017-12-14 17:51:55 -08:00
Branimir Karadžić
0d1cf61bb1 Fixed UWP build. 2017-12-13 23:40:39 -08:00
Branimir Karadžić
9d2578e2cb Updated ImGui. 2017-12-12 08:54:29 -08:00
Branimir Karadžić
88e0bab5a1 D3D11: Detect color spaces. 2017-12-05 17:31:07 -08:00
Branimir Karadžić
fd93f4ba7b Cleanup. 2017-12-04 18:57:57 -08:00
Branimir Karadžić
797658b570 Cleanup. 2017-12-03 21:43:43 -08:00
Branimir Karadžić
1d55878181 Cleanup. 2017-12-03 19:43:34 -08:00
Branimir Karadžić
6adb0090d0 Added resource stats. 2017-12-03 19:42:06 -08:00
Branimir Karadžić
547d1d2b11 Cleanup. 2017-12-02 18:15:31 -08:00
Branimir Karadžić
907f835881 Removed use of obsolete ImGui API. 2017-12-01 21:04:27 -08:00
Miodrag Milanović
46e94d6e92 Do not use IMGUI deprecated calls (#1283) 2017-12-01 07:55:14 -08:00
Branimir Karadžić
1ce463082b Fixed static init order issue. 2017-11-28 22:23:46 -08:00
Branimir Karadžić
f88c44a835 Cleanup. 2017-11-28 08:44:47 -08:00
Branimir Karadžić
f3ee8855fa Use ImGui new default dark/light style instead setting it up. 2017-11-28 08:21:18 -08:00
Branimir Karadžić
7a1e4637e3 Cleanup. 2017-11-27 23:10:34 -08:00
Branimir Karadžić
e7bcae2dfd Cleanup. 2017-11-27 19:44:27 -08:00
Branimir Karadžić
7384171900 Fixed view id remapping. 2017-11-27 15:57:31 -08:00
Branimir Karadžić
77c00da989 Changed API to use ViewId (uint16_t) instead of uint8_t. 2017-11-24 11:21:51 -08:00
Branimir Karadžić
2c7a1e5755 Cleanup. 2017-11-20 21:43:00 -08:00
Branimir Karadžić
cb9263b689 Updated ImGui. 2017-11-20 08:29:10 -08:00
Branimir Karadžić
899f72ae29 OSX: Fixed Key::Return. 2017-11-16 17:51:34 -08:00
Branimir Karadžić
bd9c62c310 GLFW: Fixed build. 2017-11-15 20:20:19 -08:00
Branimir Karadžić
e49a176d7e Cleanup. 2017-11-14 22:10:07 -08:00
Branimir Karadžić
31b1712e7c Cleanup. 2017-11-09 20:29:47 -08:00
Branimir Karadžić
d2d4c8aebb Cleanup. 2017-11-09 20:21:56 -08:00
Branimir Karadžić
05e550c2b2 Fixed build. 2017-11-04 15:49:02 -07:00
Branimir Karadžić
d97023ab85 Merge branch 'master' into encoder 2017-11-04 15:25:24 -07:00
Branimir Karadžić
2d835155a9 Fixed build. 2017-11-04 15:25:11 -07:00
Branimir Karadžić
ea7c59db33 Updated thread funcs to match bx. 2017-11-04 15:18:52 -07:00
Branimir Karadžić
a241daa114 Updated thread funcs to match bx. 2017-11-04 15:18:33 -07:00
Branimir Karadžić
6a278175ff Cleanup. 2017-11-04 10:32:31 -07:00
Branimir Karadžić
7ee2447f9d Cleanup. 2017-11-03 09:03:39 -07:00
Branimir Karadžić
1f86df4c54 Cleanup. 2017-11-02 22:09:03 -07:00