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

Fix iOS/macOS keycode handling regression for textoverlay example, update and use keycodes.hpp defines for iOS/macOS

Browse source
This commit is contained in:
Stephen Saunders 2022-05-13 21:57:30 -04:00
parent 8080b7a91b
commit a1e19ea5de
5 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

48
xcode/MVKExample.cpp
View file

@ -21,11 +21,10 @@ void MVKExample::setRefreshPeriod(double refreshPeriod) { // SRS - set Vul
_vulkanExample->refreshPeriod = refreshPeriod;
}
void MVKExample::keyPressed(uint32_t keyChar) { // SRS - handle iOS virtual screen keyboard presses
void MVKExample::keyPressed(uint32_t keyChar) { // SRS - handle keyboard key presses only (e.g. Pause, Space, etc)
switch (keyChar)
{
case 'p':
case 'P':
case KEY_P:
_vulkanExample->paused = !_vulkanExample->paused;
break;
default:
@ -34,34 +33,25 @@ void MVKExample::keyPressed(uint32_t keyChar) { // SRS - handle iOS virtual
}
}
void MVKExample::keyDown(uint32_t keyChar) { // SRS - handle physical keyboard key down/up actions
void MVKExample::keyDown(uint32_t keyChar) { // SRS - handle physical keyboard key down/up actions and presses
switch (keyChar)
{
case 'p':
case 'P':
_vulkanExample->paused = !_vulkanExample->paused;
break;
case 'w':
case 'W':
case 'z': // for French AZERTY keyboards
case 'Z':
case KEY_W:
case KEY_Z: // for French AZERTY keyboards
_vulkanExample->camera.keys.up = true;
break;
case 's':
case 'S':
case KEY_S:
_vulkanExample->camera.keys.down = true;
break;
case 'a':
case 'A':
case 'q': // for French AZERTY keyboards
case 'Q':
case KEY_A:
case KEY_Q: // for French AZERTY keyboards
_vulkanExample->camera.keys.left = true;
break;
case 'd':
case 'D':
case KEY_D:
_vulkanExample->camera.keys.right = true;
break;
default:
MVKExample::keyPressed(keyChar);
break;
}
}
@ -69,24 +59,18 @@ void MVKExample::keyDown(uint32_t keyChar) { // SRS - handle physical keyboa
void MVKExample::keyUp(uint32_t keyChar) {
switch (keyChar)
{
case 'w':
case 'W':
case 'z': // for French AZERTY keyboards
case 'Z':
case KEY_W:
case KEY_Z: // for French AZERTY keyboards
_vulkanExample->camera.keys.up = false;
break;
case 's':
case 'S':
case KEY_S:
_vulkanExample->camera.keys.down = false;
break;
case 'a':
case 'A':
case 'q': // for French AZERTY keyboards
case 'Q':
case KEY_A:
case KEY_Q: // for French AZERTY keyboards
_vulkanExample->camera.keys.left = false;
break;
case 'd':
case 'D':
case KEY_D:
_vulkanExample->camera.keys.right = false;
break;
default:

4
xcode/ios/DemoViewController.mm
View file

@ -97,13 +97,13 @@ const std::string getAssetPath() {
// A key on the keyboard has been pressed.
-(void) insertText: (NSString*) text {
unichar keychar = (text.length > 0) ? [text characterAtIndex: 0] : 0;
unichar keychar = (text.length > 0) ? [text.lowercaseString characterAtIndex: 0] : 0;
_mvkExample->keyPressed(keychar);
}
// The delete backward key has been pressed.
-(void) deleteBackward {
_mvkExample->keyPressed(0x7F);
_mvkExample->keyPressed(KEY_DELETE);
}

4
xcode/macos/DemoViewController.mm
View file

@ -91,13 +91,13 @@ MVKExample* _mvkExample;
// SRS - Handle keyboard events
-(void) keyDown:(NSEvent*) theEvent {
NSString *text = [theEvent charactersIgnoringModifiers];
unichar keychar = (text.length > 0) ? [text characterAtIndex: 0] : 0;
unichar keychar = (text.length > 0) ? [text.lowercaseString characterAtIndex: 0] : 0;
_mvkExample->keyDown(keychar);
}
-(void) keyUp:(NSEvent*) theEvent {
NSString *text = [theEvent charactersIgnoringModifiers];
unichar keychar = (text.length > 0) ? [text characterAtIndex: 0] : 0;
unichar keychar = (text.length > 0) ? [text.lowercaseString characterAtIndex: 0] : 0;
_mvkExample->keyUp(keychar);
}