diff --git a/packages/renderer-virtual/source/resource/Resource.ts b/packages/renderer-virtual/source/resource/Resource.ts index 434179d..16582a8 100644 --- a/packages/renderer-virtual/source/resource/Resource.ts +++ b/packages/renderer-virtual/source/resource/Resource.ts @@ -1,10 +1,18 @@ -import type { ResourceTypeSet } from "./ResourceType"; + +type ResourceNameType = string | number; +type ResourceIdType = string | number | symbol; interface Resource { - type: ResourceTypeSet; + /** + * Unique identification of resource type. + */ + type: ResourceNameType; - id: string | number; + /** + * Unique number of the resource instance. + */ + id: ResourceIdType; } -export type { Resource }; \ No newline at end of file +export type { Resource, ResourceNameType, ResourceIdType }; \ No newline at end of file diff --git a/packages/renderer-virtual/source/resource/ResourceSet.ts b/packages/renderer-virtual/source/resource/ResourceSet.ts index 896f95a..d70d567 100644 --- a/packages/renderer-virtual/source/resource/ResourceSet.ts +++ b/packages/renderer-virtual/source/resource/ResourceSet.ts @@ -1,5 +1,10 @@ import type { ShaderResource } from "./ShaderResource"; -type ResourceSet = ShaderResource; +namespace ResourceName { + export type Shader = ShaderResource["type"]; +} -export type { ResourceSet }; \ No newline at end of file +type ResourceSet = ShaderResource; +type ResourceNameSet = ResourceName.Shader; + +export type { ResourceName, ResourceNameSet, 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 deleted file mode 100644 index 583913c..0000000 --- a/packages/renderer-virtual/source/resource/ResourceType.ts +++ /dev/null @@ -1,9 +0,0 @@ - -namespace ResourceType { - - export type Shader = "SHADER" | 100_001; -} - -type ResourceTypeSet = ResourceType.Shader; - -export type { ResourceType, ResourceTypeSet }; \ No newline at end of file diff --git a/packages/renderer-virtual/source/resource/ShaderResource.ts b/packages/renderer-virtual/source/resource/ShaderResource.ts index 5d85c51..5da0f14 100644 --- a/packages/renderer-virtual/source/resource/ShaderResource.ts +++ b/packages/renderer-virtual/source/resource/ShaderResource.ts @@ -1,6 +1,8 @@ +import type { Resource } from "./Resource"; -interface ShaderResource { +interface ShaderResource extends Resource { + type: "SHADER" | 100_001; } export type { ShaderResource }; \ No newline at end of file