Changeset 5936c58 in opengl-game
- Timestamp:
- Aug 16, 2019, 3:56:46 PM (5 years ago)
- Branches:
- feature/imgui-sdl, master, points-test
- Children:
- 9cd92ae
- Parents:
- e1a7f5a
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
shaders/shader.frag
re1a7f5a r5936c58 13 13 void main() { 14 14 if (isOverlay == 1) { 15 outColor = vec4(fragColor * texture(uiTexSampler, fragTexCoord).rgb, 1.0);15 outColor = texture(uiTexSampler, fragTexCoord); 16 16 } else { 17 17 outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0); -
vulkan-game.cpp
re1a7f5a r5936c58 1725 1725 SDL_SetRenderTarget(gRenderer, uiOverlay); 1726 1726 1727 SDL_SetRenderDrawColor(gRenderer, 0x00, 0x 9F, 0x9F, 0xFF);1727 SDL_SetRenderDrawColor(gRenderer, 0x00, 0x00, 0x00, 0x00); 1728 1728 SDL_RenderClear(gRenderer); 1729 1729 … … 1731 1731 1732 1732 rect = {280, 220, 100, 100}; 1733 SDL_SetRenderDrawColor(gRenderer, 0x FF, 0x00, 0x00, 0xFF);1733 SDL_SetRenderDrawColor(gRenderer, 0x00, 0xFF, 0x00, 0xFF); 1734 1734 SDL_RenderFillRect(gRenderer, &rect); 1735 1735 SDL_SetRenderDrawColor(gRenderer, 0x00, 0x9F, 0x9F, 0xFF); … … 1743 1743 SDL_RenderCopy(gRenderer, uiImage, nullptr, &rect); 1744 1744 1745 SDL_SetRenderDrawColor(gRenderer, 0x FF, 0x00, 0x00, 0xFF);1745 SDL_SetRenderDrawColor(gRenderer, 0x00, 0x00, 0xFF, 0xFF); 1746 1746 SDL_RenderDrawLine(gRenderer, 50, 5, 150, 500); 1747 1747
Note:
See TracChangeset
for help on using the changeset viewer.