Changeset 52a02e6 in opengl-game for vulkan-game.hpp
- Timestamp:
- Apr 26, 2020, 6:08:05 PM (4 years ago)
- Branches:
- feature/imgui-sdl, master
- Children:
- 4a9416a
- Parents:
- 73a10ca
- git-author:
- Dmitry Portnoy <dmitry.portnoy@…> (04/26/20 17:55:49)
- git-committer:
- Dmitry Portnoy <dmitry.portnoy@…> (04/26/20 18:08:05)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
vulkan-game.hpp
r73a10ca r52a02e6 57 57 }; 58 58 59 struct UBO_VP_mats {60 alignas(16) mat4 view;61 alignas(16) mat4 proj;62 };63 64 59 struct SSBO_ModelObject { 65 60 alignas(16) mat4 model; … … 76 71 alignas(4) vec3 color; 77 72 alignas(4) unsigned int deleted; 73 }; 74 75 struct UBO_VP_mats { 76 alignas(16) mat4 view; 77 alignas(16) mat4 proj; 78 78 }; 79 79 … … 175 175 176 176 private: 177 // TODO: Make these consts static 178 177 179 const int MAX_FRAMES_IN_FLIGHT; 178 180 … … 334 336 void createSyncObjects(); 335 337 336 void addLaser(vec3 start, vec3 end, vec3 color, float width);337 void translateLaser(size_t index, const vec3& translation);338 void updateLaserTarget(size_t index);339 bool getLaserAndAsteroidIntersection(SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid,340 vec3& start, vec3& end, vec3& intersection);341 342 338 // TODO: Since addObject() returns a reference to the new object now, 343 339 // stop using objects.back() to access the object that was just created … … 365 361 template<class VertexType, class SSBOType> 366 362 void centerObject(SceneObject<VertexType, SSBOType>& object); 363 364 void addLaser(vec3 start, vec3 end, vec3 color, float width); 365 void translateLaser(size_t index, const vec3& translation); 366 void updateLaserTarget(size_t index); 367 bool getLaserAndAsteroidIntersection(SceneObject<AsteroidVertex, SSBO_Asteroid>& asteroid, 368 vec3& start, vec3& end, vec3& intersection); 367 369 368 370 void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
Note:
See TracChangeset
for help on using the changeset viewer.