Mercurial > games > semicongine
diff src/zamikongine/engine.nim @ 38:c3c963e7c1a6
did: tons of stuff, input, refactoring, fix some errors, some template improvment, sorry for super-commit
author | Sam <sam@basx.dev> |
---|---|
date | Wed, 18 Jan 2023 09:52:03 +0700 |
parents | 94c38e4b5782 |
children | 0cb294c5d2fd |
line wrap: on
line diff
--- a/src/zamikongine/engine.nim Mon Jan 16 00:51:03 2023 +0700 +++ b/src/zamikongine/engine.nim Wed Jan 18 09:52:03 2023 +0700 @@ -79,10 +79,20 @@ imageAvailableSemaphores*: array[MAX_FRAMES_IN_FLIGHT, VkSemaphore] renderFinishedSemaphores*: array[MAX_FRAMES_IN_FLIGHT, VkSemaphore] inFlightFences*: array[MAX_FRAMES_IN_FLIGHT, VkFence] + Input* = object + keysDown*: set[Key] + keysPressed*: set[Key] + keysReleased*: set[Key] + mouseDown*: set[MouseButton] + mousePressed*: set[MouseButton] + mouseReleased*: set[MouseButton] + mouseX*: int + mouseY*: int Engine* = object vulkan*: Vulkan window*: NativeWindow currentscenedata*: ref Thing + input*: Input proc getAllPhysicalDevices(instance: VkInstance, surface: VkSurfaceKHR): seq[PhysicalDevice] = for vulkanPhysicalDevice in getVulkanPhysicalDevices(instance): @@ -518,13 +528,14 @@ var ubermesh = createUberMesh(allmeshes) result.vertexBuffers.add createVertexBuffers(ubermesh, result.device, engine.vulkan.device.physicalDevice.device, engine.vulkan.commandPool, engine.vulkan.device.graphicsQueue) - # vertex buffers with indexes - var allindexedmeshes: seq[IndexedMesh[VertexType, IndexType]] - for mesh in partsOfType[ref IndexedMesh[VertexType, IndexType]](engine.currentscenedata): - allindexedmeshes.add(mesh[]) - if allindexedmeshes.len > 0: - var indexedubermesh = createUberMesh(allindexedmeshes) - result.indexedVertexBuffers.add createIndexedVertexBuffers(indexedubermesh, result.device, engine.vulkan.device.physicalDevice.device, engine.vulkan.commandPool, engine.vulkan.device.graphicsQueue) + when not IndexType is void: + # vertex buffers with indexes + var allindexedmeshes: seq[IndexedMesh[VertexType, IndexType]] + for mesh in partsOfType[ref IndexedMesh[VertexType, IndexType]](engine.currentscenedata): + allindexedmeshes.add(mesh[]) + if allindexedmeshes.len > 0: + var indexedubermesh = createUberMesh(allindexedmeshes) + result.indexedVertexBuffers.add createIndexedVertexBuffers(indexedubermesh, result.device, engine.vulkan.device.physicalDevice.device, engine.vulkan.commandPool, engine.vulkan.device.graphicsQueue) # uniform buffers result.uniformBuffers = createUniformBuffers[MAX_FRAMES_IN_FLIGHT, UniformType]( @@ -704,16 +715,31 @@ while not killed: # process input + engine.input.keysPressed = {} + engine.input.keysReleased = {} + engine.input.mousePressed = {} + engine.input.mouseReleased = {} for event in engine.window.pendingEvents(): case event.eventType: of Quit: killed = true of ResizedWindow: resized = true - of KeyDown: - echo event - if event.key == Escape: - killed = true + of KeyPressed: + engine.input.keysPressed.incl event.key + engine.input.keysDown.incl event.key + of KeyReleased: + engine.input.keysReleased.incl event.key + engine.input.keysDown.excl event.key + of MousePressed: + engine.input.mousePressed.incl event.button + engine.input.mouseDown.incl event.button + of MouseReleased: + engine.input.mouseReleased.incl event.button + engine.input.mouseDown.excl event.button + of MouseMoved: + engine.input.mouseX = event.x + engine.input.mouseY = event.y else: discard