AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-09 13:50:05 +00:00
Code Issues Releases Wiki Activity

Updated OpenSubdiv logo in examples HUD

Browse Source 
Reorganized the character cells used for UI
elements and removed elements that were not
being used in order to provide more space
for the logo image and logo text.

Updated to the new OpenSubdiv logo and updated
the HUD drawing code used to display the logo
character cells.
This commit is contained in:
David G Yu 2019-06-20 13:51:14 -07:00
parent fdd08b96f1
commit 64d366a145
4 changed files with 934 additions and 930 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/common/font.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

1837
examples/common/font_image.cpp
View File

File diff suppressed because it is too large Load Diff

14
examples/common/font_image.h
View File

@ -31,16 +31,16 @@
#define FONT_TEXTURE_ROWS 8
#define FONT_CHAR_WIDTH (FONT_TEXTURE_WIDTH/FONT_TEXTURE_COLUMNS)
#define FONT_CHAR_HEIGHT (FONT_TEXTURE_HEIGHT/FONT_TEXTURE_ROWS)
#define FONT_CHECK_BOX_OFF 0x3
#define FONT_CHECK_BOX_ON 0x4
#define FONT_RADIO_BUTTON_OFF 0x6
#define FONT_RADIO_BUTTON_ON 0x7
#define FONT_CHECK_BOX_OFF 0x2
#define FONT_CHECK_BOX_ON 0x3
#define FONT_RADIO_BUTTON_OFF 0x4
#define FONT_RADIO_BUTTON_ON 0x5
#define FONT_SLIDER_LEFT 0x10
#define FONT_SLIDER_MIDDLE 0x11
#define FONT_SLIDER_RIGHT 0x12
#define FONT_SLIDER_CURSOR 0x7c
#define FONT_ARROW_RIGHT 0x15
#define FONT_ARROW_DOWN 0x17
#define FONT_SLIDER_CURSOR 0x13
#define FONT_ARROW_RIGHT 0x14
#define FONT_ARROW_DOWN 0x15
extern unsigned char font_image[];

13
examples/common/hud.cpp
View File

@ -556,10 +556,15 @@ Hud::Rebuild(int width, int height, int framebufferWidth, int framebufferHeight)
}
}
drawString(_staticVboSource, _windowWidth-80, _windowHeight-48, .5, .5, .5,
"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f");
drawString(_staticVboSource, _windowWidth-80, _windowHeight-32, .5, .5, .5,
"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f");
// draw the character cells corresponding to the logo
drawString(_staticVboSource, _windowWidth-128, _windowHeight-44, .5, .5, .5,
"\x06\x07\x08\x09");
drawString(_staticVboSource, _windowWidth-128, _windowHeight-28, .5, .5, .5,
"\x16\x17\x18\x19");
drawString(_staticVboSource, _windowWidth-92, _windowHeight-36, .5, .5, .5,
"\x0a\x0b\x0c\x0d");
drawString(_staticVboSource, _windowWidth-58, _windowHeight-36, .5, .5, .5,
"\x1a\x1b\x1c\x1d\x1e\x1f");
}
bool