claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #219 from lordheavy/origin/fix-linux-keyboard

Browse source 
Origin/fix linux keyboard
This commit is contained in:
Sascha Willems 2016-08-11 19:36:53 +02:00 • committed by GitHub
commit fd2859b81e
21 changed files with 94 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

26
base/keycodes.hpp
View file

@ -17,16 +17,38 @@
#define KEY_S 0x53
#define KEY_D 0x44
#define KEY_P 0x50
//
#define KEY_SPACE 0x20
#define KEY_KPADD 0x6B
#define KEY_KPSUB 0x6D
#define KEY_B 0x42
#define KEY_F 0x46
#define KEY_L 0x4C
#define KEY_N 0x4E
#define KEY_O 0x4F
#define KEY_T 0x54
//
#elif defined(__ANDROID__)
#elif defined(__linux__)
#define KEY_ESCAPE 0x9
#define KEY_F1 0x43
#define KEY_F2 0x44
#define KEY_W 0x19
#define KEY_A 0x26
#define KEY_S 0x27
#define KEY_D 0x28
#define KEY_P 0x21
#define KEY_F1 0x43
#define KEY_F2 0x44
//
#define KEY_SPACE 0x41
#define KEY_KPADD 0x56
#define KEY_KPSUB 0x52
#define KEY_B 0x38
#define KEY_F 0x29
#define KEY_L 0x2E
#define KEY_N 0x39
#define KEY_O 0x20
#define KEY_T 0x1C
//
#endif
// todo: Android gamepad keycodes outside of define for now

6
bloom/bloom.cpp
View file

@ -1113,15 +1113,15 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeBlurScale(0.25f);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeBlurScale(-0.25f);
break;
case 0x42:
case KEY_B:
case GAMEPAD_BUTTON_A:
toggleBloom();
break;

4
computeshader/computeshader.cpp
View file

@ -774,11 +774,11 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
switchComputePipeline(1);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
switchComputePipeline(-1);
break;

2
deferred/deferred.cpp
View file

@ -1221,7 +1221,7 @@ public:
{
switch (keyCode)
{
case 0x70:
case KEY_F1:
case GAMEPAD_BUTTON_A:
toggleDebugDisplay();
updateTextOverlay();

4
deferredshadows/deferredshadows.cpp
View file

@ -1208,12 +1208,12 @@ public:
{
switch (keyCode)
{
case 0x70:
case KEY_F1:
case GAMEPAD_BUTTON_A:
toggleDebugDisplay();
updateTextOverlay();
break;
case 0x71:
case KEY_F2:
case GAMEPAD_BUTTON_X:
toggleShadows();
updateTextOverlay();

8
displacement/displacement.cpp
View file

@ -557,19 +557,19 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeTessellationStrength(0.025);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeTessellationStrength(-0.025);
break;
case 0x44:
case KEY_D:
case GAMEPAD_BUTTON_A:
toggleDisplacement();
break;
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_X:
toggleSplitScreen();
break;

4
distancefieldfonts/distancefieldfonts.cpp
View file

@ -716,11 +716,11 @@ public:
{
switch (keyCode)
{
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_X:
toggleSplitScreen();
break;
case 0x4F:
case KEY_O:
case GAMEPAD_BUTTON_A:
toggleFontOutline();
break;

2
geometryshader/geometryshader.cpp
View file

@ -478,7 +478,7 @@ public:
{
switch (keyCode)
{
case 0x4E:
case KEY_N:
case GAMEPAD_BUTTON_A:
toggleNormals();
break;

2
offscreen/offscreen.cpp
View file

@ -996,7 +996,7 @@ public:
{
switch (keyCode)
{
case 0x44:
case KEY_D:
case GAMEPAD_BUTTON_A:
toggleDebugDisplay();
break;

6
parallaxmapping/parallaxmapping.cpp
View file

@ -583,15 +583,15 @@ public:
{
switch (keyCode)
{
case 0x4F:
case KEY_O:
case GAMEPAD_BUTTON_A:
toggleParallaxOffset();
break;
case 0x4E:
case KEY_N:
case GAMEPAD_BUTTON_X:
toggleNormalMapDisplay();
break;
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_Y:
toggleSplitScreen();
break;

4
radialblur/radialblur.cpp
View file

@ -980,11 +980,11 @@ public:
{
switch (keyCode)
{
case 0x42:
case KEY_B:
case GAMEPAD_BUTTON_A:
toggleBlur();
break;
case 0x54:
case KEY_T:
case GAMEPAD_BUTTON_X:
toggleTextureDisplay();
break;

10
scenerendering/scenerendering.cpp
View file

@ -832,27 +832,27 @@ public:
{
switch (keyCode)
{
case 0x20:
case KEY_SPACE:
case GAMEPAD_BUTTON_A:
wireframe = !wireframe;
reBuildCommandBuffers();
break;
case 0x50:
case KEY_P:
scene->renderSingleScenePart = !scene->renderSingleScenePart;
reBuildCommandBuffers();
updateTextOverlay();
break;
case 0x6B:
case KEY_KPADD:
scene->scenePartIndex = (scene->scenePartIndex < static_cast<uint32_t>(scene->meshes.size())) ? scene->scenePartIndex + 1 : 0;
reBuildCommandBuffers();
updateTextOverlay();
break;
case 0x6D:
case KEY_KPSUB:
scene->scenePartIndex = (scene->scenePartIndex > 0) ? scene->scenePartIndex - 1 : static_cast<uint32_t>(scene->meshes.size()) - 1;
updateTextOverlay();
reBuildCommandBuffers();
break;
case 0x4C:
case KEY_L:
attachLight = !attachLight;
updateUniformBuffers();
break;

4
shadowmapping/shadowmapping.cpp
View file

@ -1019,11 +1019,11 @@ public:
{
switch (keyCode)
{
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_A:
toggleShadowMapDisplay();
break;
case 0x4C:
case KEY_L:
case GAMEPAD_BUTTON_X:
toogleLightPOV();
break;

2
shadowmappingomni/shadowmappingomni.cpp
View file

@ -1068,7 +1068,7 @@ public:
{
switch (keyCode)
{
case 0x44:
case KEY_D:
case GAMEPAD_BUTTON_A:
toggleCubeMapDisplay();
break;

4
skeletalanimation/skeletalanimation.cpp
View file

@ -1036,11 +1036,11 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeAnimationSpeed(0.1f);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeAnimationSpeed(-0.1f);
break;

6
sphericalenvmapping/sphericalenvmapping.cpp
View file

@ -452,12 +452,12 @@ public:
{
switch (keyCode)
{
case 0x6B:
case 0x20:
case KEY_KPADD:
case KEY_SPACE:
case GAMEPAD_BUTTON_A:
changeMatCapIndex(1);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_X:
changeMatCapIndex(-1);
break;

8
terraintessellation/terraintessellation.cpp
View file

@ -939,19 +939,19 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeTessellationFactor(0.05f);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeTessellationFactor(-0.05f);
break;
case 0x46:
case KEY_F:
case GAMEPAD_BUTTON_A:
toggleWireframe();
break;
case 0x54:
case KEY_T:
case GAMEPAD_BUTTON_X:
toggleTessellation();
break;

8
tessellation/tessellation.cpp
View file

@ -533,19 +533,19 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeTessellationLevel(0.25);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeTessellationLevel(-0.25);
break;
case 0x57:
case KEY_W:
case GAMEPAD_BUTTON_A:
togglePipelines();
break;
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_X:
toggleSplitScreen();
break;

4
textoverlay/textoverlay.cpp
View file

@ -1198,8 +1198,8 @@ public:
{
switch (keyCode)
{
case 0x6B:
case 0x20:
case KEY_KPADD:
case KEY_SPACE:
textOverlay->visible = !textOverlay->visible;
}
}

4
texture/texture.cpp
View file

@ -875,11 +875,11 @@ public:
{
switch (keyCode)
{
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeLodBias(0.1f);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeLodBias(-0.1f);
break;

8
texturecubemap/texturecubemap.cpp
View file

@ -737,19 +737,19 @@ public:
{
switch (keyCode)
{
case 0x53:
case KEY_S:
case GAMEPAD_BUTTON_A:
toggleSkyBox();
break;
case 0x20:
case KEY_SPACE:
case GAMEPAD_BUTTON_X:
toggleObject();
break;
case 0x6B:
case KEY_KPADD:
case GAMEPAD_BUTTON_R1:
changeLodBias(0.1f);
break;
case 0x6D:
case KEY_KPSUB:
case GAMEPAD_BUTTON_L1:
changeLodBias(-0.1f);
break;