From 83dac5289f08361fa8ee18a4ef76164b72b1be5c Mon Sep 17 00:00:00 2001 From: MrKBear Date: Thu, 9 Feb 2023 11:02:35 +0800 Subject: [PATCH] Unified virtual renderer resource naming. --- packages/renderer-virtual/source/resource/Resource.ts | 4 ++-- packages/renderer-virtual/source/resource/ResourceSet.ts | 5 +++++ packages/renderer-virtual/source/resource/ResourceType.ts | 4 ++-- packages/renderer-virtual/source/resource/Shader.ts | 0 packages/renderer-virtual/source/resource/ShaderResource.ts | 6 ++++++ packages/renderer-virtual/source/virtual-renderer.ts | 4 +++- 6 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 packages/renderer-virtual/source/resource/ResourceSet.ts delete mode 100644 packages/renderer-virtual/source/resource/Shader.ts create mode 100644 packages/renderer-virtual/source/resource/ShaderResource.ts diff --git a/packages/renderer-virtual/source/resource/Resource.ts b/packages/renderer-virtual/source/resource/Resource.ts index dae32df..434179d 100644 --- a/packages/renderer-virtual/source/resource/Resource.ts +++ b/packages/renderer-virtual/source/resource/Resource.ts @@ -1,8 +1,8 @@ -import type { ResourceSet } from "./ResourceType"; +import type { ResourceTypeSet } from "./ResourceType"; interface Resource { - type: ResourceSet; + type: ResourceTypeSet; id: string | number; } diff --git a/packages/renderer-virtual/source/resource/ResourceSet.ts b/packages/renderer-virtual/source/resource/ResourceSet.ts new file mode 100644 index 0000000..896f95a --- /dev/null +++ b/packages/renderer-virtual/source/resource/ResourceSet.ts @@ -0,0 +1,5 @@ +import type { ShaderResource } from "./ShaderResource"; + +type ResourceSet = ShaderResource; + +export type { ResourceSet }; \ No newline at end of file diff --git a/packages/renderer-virtual/source/resource/ResourceType.ts b/packages/renderer-virtual/source/resource/ResourceType.ts index 542c8e9..583913c 100644 --- a/packages/renderer-virtual/source/resource/ResourceType.ts +++ b/packages/renderer-virtual/source/resource/ResourceType.ts @@ -4,6 +4,6 @@ namespace ResourceType { export type Shader = "SHADER" | 100_001; } -type ResourceSet = ResourceType.Shader; +type ResourceTypeSet = ResourceType.Shader; -export type { ResourceType, ResourceSet }; \ No newline at end of file +export type { ResourceType, ResourceTypeSet }; \ No newline at end of file diff --git a/packages/renderer-virtual/source/resource/Shader.ts b/packages/renderer-virtual/source/resource/Shader.ts deleted file mode 100644 index e69de29..0000000 diff --git a/packages/renderer-virtual/source/resource/ShaderResource.ts b/packages/renderer-virtual/source/resource/ShaderResource.ts new file mode 100644 index 0000000..5d85c51 --- /dev/null +++ b/packages/renderer-virtual/source/resource/ShaderResource.ts @@ -0,0 +1,6 @@ + +interface ShaderResource { + +} + +export type { ShaderResource }; \ No newline at end of file diff --git a/packages/renderer-virtual/source/virtual-renderer.ts b/packages/renderer-virtual/source/virtual-renderer.ts index 7e9a595..52236ad 100644 --- a/packages/renderer-virtual/source/virtual-renderer.ts +++ b/packages/renderer-virtual/source/virtual-renderer.ts @@ -4,4 +4,6 @@ export * from "command/CommandType"; export * from "command/RenderCommand"; export * from "command/ClearCommand"; export * from "resource/Resource"; -export * from "resource/ResourceType"; \ No newline at end of file +export * from "resource/ResourceSet"; +export * from "resource/ResourceType"; +export * from "resource/ShaderResource"; \ No newline at end of file