fix: complete architecture consolidation contracts
This commit is contained in:
1 parent
f3fc615443
commit
63246b8c68
497 files changed
+14385
-17010
No files matched your search
@@ -1,7 +1,7 @@
|
||||
#include "graphics/webgpu/Graphics.h"
|
||||
#include "graphics/GraphicsCapabilities.h"
|
||||
#include "graphics/Batcher.h"
|
||||
#include "graphics/ClusteredLight.h"
|
||||
#include "graphics/GraphicsCapabilities.h"
|
||||
#include "graphics/Light.h"
|
||||
#include "graphics/Mesh.h"
|
||||
#include "graphics/RenderControl.h"
|
||||
@@ -9,9 +9,9 @@
|
||||
#include "graphics/Shadow.h"
|
||||
#include "graphics/Texture.h"
|
||||
#include "graphics/TextureSampler.h"
|
||||
#include "graphics/webgpu/BindGroupLayoutBuilder.h"
|
||||
#include "graphics/webgpu/Canvas.h"
|
||||
#include "graphics/webgpu/InitFlow.h"
|
||||
#include "graphics/webgpu/BindGroupLayoutBuilder.h"
|
||||
#include "graphics/webgpu/PipelineBuilder.h"
|
||||
#include "graphics/webgpu/wgsl_shaders.h"
|
||||
|
||||
@@ -2083,14 +2083,12 @@ Mesh *Graphics::newMeshFromArrays(const float *posXYZ, const float *nrmXYZ, cons
|
||||
std::optional<eve::graphics::MeshBackendDescriptor> Graphics::describeMesh(Mesh *mesh) const {
|
||||
if (!mesh || !mesh->gpuHandle) return std::nullopt;
|
||||
const auto *gpu = static_cast<const GpuMesh *>(mesh->gpuHandle);
|
||||
const auto owned = std::find_if(ownedGpuMeshes.begin(), ownedGpuMeshes.end(),
|
||||
[gpu](const std::unique_ptr<GpuMesh> &candidate) {
|
||||
return candidate.get() == gpu;
|
||||
});
|
||||
const auto owned =
|
||||
std::find_if(ownedGpuMeshes.begin(), ownedGpuMeshes.end(),
|
||||
[gpu](const std::unique_ptr<GpuMesh> &candidate) { return candidate.get() == gpu; });
|
||||
if (owned == ownedGpuMeshes.end()) return std::nullopt;
|
||||
return eve::graphics::MeshBackendDescriptor{
|
||||
gpu->vertexCount, gpu->indexCount, gpu->vertexStride,
|
||||
gpu->indexFormat == wgpu::IndexFormat::Uint16 ? 2u : 4u};
|
||||
return eve::graphics::MeshBackendDescriptor{gpu->vertexCount, gpu->indexCount, gpu->vertexStride,
|
||||
gpu->indexFormat == wgpu::IndexFormat::Uint16 ? 2u : 4u};
|
||||
}
|
||||
|
||||
Mesh *Graphics::newMeshFromAssimp(const ::aiMesh &mesh) {
|
||||
|
||||
Reference in new issue
Block a user