From d9c271ee00ed73c482f3d45c2caa50f4cf02c6fa Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Sat, 29 Dec 2018 18:28:35 +0800 Subject: [PATCH] structure --- .../binding-layout.ts} | 8 +- .../gfx/gfx-buffer.ts => gfx/buffer.ts} | 4 +- .../command-allocator.ts} | 6 +- .../command-buffer.ts} | 18 +-- .../gfx/gfx-define.ts => gfx/define.ts} | 0 .../gfx/gfx-device.ts => gfx/device.ts} | 30 ++--- .../gfx-framebuffer.ts => gfx/framebuffer.ts} | 6 +- cocos/gfx/index.ts | 29 ++++ .../input-assembler.ts} | 8 +- .../pipeline-layout.ts} | 6 +- .../pipeline-state.ts} | 10 +- .../gfx/gfx-queue.ts => gfx/queue.ts} | 2 +- .../gfx-render-pass.ts => gfx/render-pass.ts} | 4 +- .../gfx/gfx-sampler.ts => gfx/sampler.ts} | 26 ++-- .../gfx/gfx-shader.ts => gfx/shader.ts} | 6 +- .../texture-view.ts} | 6 +- .../gfx/gfx-texture.ts => gfx/texture.ts} | 4 +- .../webgl/webgl-binding-layout.ts} | 6 +- .../webgl/webgl-buffer.ts} | 8 +- .../webgl/webgl-command-allocator.ts} | 8 +- .../webgl/webgl-command-buffer.ts} | 38 +++--- .../gfx/webgl/webgl-commands.ts | 22 +-- .../webgl/webgl-device.ts} | 64 ++++----- .../webgl/webgl-framebuffer.ts} | 8 +- .../gfx/webgl/webgl-gpu-objects.ts | 20 +-- .../webgl/webgl-input-assembler.ts} | 6 +- .../webgl/webgl-pipeline-layout.ts} | 6 +- .../webgl/webgl-pipeline-state.ts} | 6 +- .../webgl/webgl-queue.ts} | 10 +- .../webgl/webgl-render-pass.ts} | 10 +- .../webgl/webgl-sampler.ts} | 6 +- .../webgl/webgl-shader.ts} | 6 +- .../gfx/webgl/webgl-state-cache.ts | 6 +- .../webgl/webgl-texture-view.ts} | 6 +- .../webgl/webgl-texture.ts} | 8 +- .../webgl/webgl-window.ts} | 16 +-- .../gfx/gfx-window.ts => gfx/window.ts} | 12 +- cocos/renderer/core/constants.js | 13 -- cocos/renderer/core/constants.ts | 11 ++ cocos/renderer/core/pass.js | 126 ------------------ cocos/renderer/core/pass.ts | 52 ++++++++ cocos/renderer/gfx/index.js | 30 ----- index.js | 1 + 43 files changed, 301 insertions(+), 377 deletions(-) rename cocos/{renderer/gfx/gfx-binding-layout.ts => gfx/binding-layout.ts} (92%) rename cocos/{renderer/gfx/gfx-buffer.ts => gfx/buffer.ts} (94%) rename cocos/{renderer/gfx/gfx-command-allocator.ts => gfx/command-allocator.ts} (86%) rename cocos/{renderer/gfx/gfx-command-buffer.ts => gfx/command-buffer.ts} (81%) rename cocos/{renderer/gfx/gfx-define.ts => gfx/define.ts} (100%) rename cocos/{renderer/gfx/gfx-device.ts => gfx/device.ts} (67%) rename cocos/{renderer/gfx/gfx-framebuffer.ts => gfx/framebuffer.ts} (80%) create mode 100644 cocos/gfx/index.ts rename cocos/{renderer/gfx/gfx-input-assembler.ts => gfx/input-assembler.ts} (94%) rename cocos/{renderer/gfx/gfx-pipeline-layout.ts => gfx/pipeline-layout.ts} (81%) rename cocos/{renderer/gfx/gfx-pipeline-state.ts => gfx/pipeline-state.ts} (96%) rename cocos/{renderer/gfx/gfx-queue.ts => gfx/queue.ts} (92%) rename cocos/{renderer/gfx/gfx-render-pass.ts => gfx/render-pass.ts} (96%) rename cocos/{renderer/gfx/gfx-sampler.ts => gfx/sampler.ts} (63%) rename cocos/{renderer/gfx/gfx-shader.ts => gfx/shader.ts} (91%) rename cocos/{renderer/gfx/gfx-texture-view.ts => gfx/texture-view.ts} (91%) rename cocos/{renderer/gfx/gfx-texture.ts => gfx/texture.ts} (95%) rename cocos/{renderer/gfx/webgl/webgl-gfx-binding-layout.ts => gfx/webgl/webgl-binding-layout.ts} (92%) rename cocos/{renderer/gfx/webgl/webgl-gfx-buffer.ts => gfx/webgl/webgl-buffer.ts} (88%) rename cocos/{renderer/gfx/webgl/webgl-gfx-command-allocator.ts => gfx/webgl/webgl-command-allocator.ts} (97%) rename cocos/{renderer/gfx/webgl/webgl-gfx-command-buffer.ts => gfx/webgl/webgl-command-buffer.ts} (87%) rename cocos/{renderer => }/gfx/webgl/webgl-commands.ts (99%) rename cocos/{renderer/gfx/webgl/webgl-gfx-device.ts => gfx/webgl/webgl-device.ts} (94%) rename cocos/{renderer/gfx/webgl/webgl-gfx-framebuffer.ts => gfx/webgl/webgl-framebuffer.ts} (85%) rename cocos/{renderer => }/gfx/webgl/webgl-gpu-objects.ts (93%) rename cocos/{renderer/gfx/webgl/webgl-gfx-input-assembler.ts => gfx/webgl/webgl-input-assembler.ts} (86%) rename cocos/{renderer/gfx/webgl/webgl-gfx-pipeline-layout.ts => gfx/webgl/webgl-pipeline-layout.ts} (80%) rename cocos/{renderer/gfx/webgl/webgl-gfx-pipeline-state.ts => gfx/webgl/webgl-pipeline-state.ts} (86%) rename cocos/{renderer/gfx/webgl/webgl-gfx-queue.ts => gfx/webgl/webgl-queue.ts} (72%) rename cocos/{renderer/gfx/webgl/webgl-gfx-render-pass.ts => gfx/webgl/webgl-render-pass.ts} (81%) rename cocos/{renderer/gfx/webgl/webgl-gfx-sampler.ts => gfx/webgl/webgl-sampler.ts} (83%) rename cocos/{renderer/gfx/webgl/webgl-gfx-shader.ts => gfx/webgl/webgl-shader.ts} (85%) rename cocos/{renderer => }/gfx/webgl/webgl-state-cache.ts (96%) rename cocos/{renderer/gfx/webgl/webgl-gfx-texture-view.ts => gfx/webgl/webgl-texture-view.ts} (87%) rename cocos/{renderer/gfx/webgl/webgl-gfx-texture.ts => gfx/webgl/webgl-texture.ts} (90%) rename cocos/{renderer/gfx/webgl/webgl-gfx-window.ts => gfx/webgl/webgl-window.ts} (92%) rename cocos/{renderer/gfx/gfx-window.ts => gfx/window.ts} (84%) delete mode 100644 cocos/renderer/core/constants.js create mode 100644 cocos/renderer/core/constants.ts delete mode 100644 cocos/renderer/core/pass.js create mode 100644 cocos/renderer/core/pass.ts diff --git a/cocos/renderer/gfx/gfx-binding-layout.ts b/cocos/gfx/binding-layout.ts similarity index 92% rename from cocos/renderer/gfx/gfx-binding-layout.ts rename to cocos/gfx/binding-layout.ts index f6278e0a45..9ff0a7e3e1 100644 --- a/cocos/renderer/gfx/gfx-binding-layout.ts +++ b/cocos/gfx/binding-layout.ts @@ -1,7 +1,7 @@ -import { GFXDevice } from './gfx-device'; -import { GFXBuffer } from './gfx-buffer'; -import { GFXTextureView } from './gfx-texture-view'; -import { GFXSampler } from './gfx-sampler'; +import { GFXDevice } from './device'; +import { GFXBuffer } from './buffer'; +import { GFXTextureView } from './texture-view'; +import { GFXSampler } from './sampler'; export enum GFXBindingType { UNKNOWN, diff --git a/cocos/renderer/gfx/gfx-buffer.ts b/cocos/gfx/buffer.ts similarity index 94% rename from cocos/renderer/gfx/gfx-buffer.ts rename to cocos/gfx/buffer.ts index 9fc9f8c68e..e7335869c0 100644 --- a/cocos/renderer/gfx/gfx-buffer.ts +++ b/cocos/gfx/buffer.ts @@ -1,5 +1,5 @@ -import { GFXDevice } from './gfx-device'; -import { BufferView } from './gfx-define'; +import { GFXDevice } from './device'; +import { BufferView } from './define'; export enum GFXBufferUsageBit { NONE = 0, diff --git a/cocos/renderer/gfx/gfx-command-allocator.ts b/cocos/gfx/command-allocator.ts similarity index 86% rename from cocos/renderer/gfx/gfx-command-allocator.ts rename to cocos/gfx/command-allocator.ts index e4e9bd5fc2..5ac927da20 100644 --- a/cocos/renderer/gfx/gfx-command-allocator.ts +++ b/cocos/gfx/command-allocator.ts @@ -1,10 +1,10 @@ -import { GFXDevice } from './gfx-device'; +import { GFXDevice } from './device'; export interface GFXCommandAllocatorInfo { }; export abstract class GFXCommandAllocator { - + constructor(device : GFXDevice) { this._device = device; } @@ -13,4 +13,4 @@ export abstract class GFXCommandAllocator { public abstract destroy(); protected _device : GFXDevice; -} \ No newline at end of file +} diff --git a/cocos/renderer/gfx/gfx-command-buffer.ts b/cocos/gfx/command-buffer.ts similarity index 81% rename from cocos/renderer/gfx/gfx-command-buffer.ts rename to cocos/gfx/command-buffer.ts index 09804ea0c1..154a8d2ba6 100644 --- a/cocos/renderer/gfx/gfx-command-buffer.ts +++ b/cocos/gfx/command-buffer.ts @@ -1,12 +1,12 @@ -import { GFXDevice } from './gfx-device'; -import { GFXCommandAllocator } from './gfx-command-allocator'; -import { GFXBuffer } from './gfx-buffer'; -import { GFXInputAssembler } from './gfx-input-assembler'; -import { GFXPipelineState } from './gfx-pipeline-state'; -import { GFXBindingLayout } from './gfx-binding-layout'; -import { GFXTextureLayout } from './gfx-render-pass'; -import { GFXTexture } from './gfx-texture'; -import { GFXFramebuffer } from './gfx-framebuffer'; +import { GFXDevice } from './device'; +import { GFXCommandAllocator } from './command-allocator'; +import { GFXBuffer } from './buffer'; +import { GFXInputAssembler } from './input-assembler'; +import { GFXPipelineState } from './pipeline-state'; +import { GFXBindingLayout } from './binding-layout'; +import { GFXTextureLayout } from './render-pass'; +import { GFXTexture } from './texture'; +import { GFXFramebuffer } from './framebuffer'; export class GFXTextureSubres { diff --git a/cocos/renderer/gfx/gfx-define.ts b/cocos/gfx/define.ts similarity index 100% rename from cocos/renderer/gfx/gfx-define.ts rename to cocos/gfx/define.ts diff --git a/cocos/renderer/gfx/gfx-device.ts b/cocos/gfx/device.ts similarity index 67% rename from cocos/renderer/gfx/gfx-device.ts rename to cocos/gfx/device.ts index 81aeccc495..cb18c3efa5 100644 --- a/cocos/renderer/gfx/gfx-device.ts +++ b/cocos/gfx/device.ts @@ -1,18 +1,18 @@ -import { GFXBuffer, GFXBufferInfo } from './gfx-buffer'; -import { GFXQueue, GFXQueueInfo } from './gfx-queue'; -import { GFXTexture, GFXTextureInfo } from './gfx-texture'; -import { GFXTextureViewInfo, GFXTextureView } from './gfx-texture-view'; -import { GFXFramebufferInfo, GFXFramebuffer } from './gfx-framebuffer'; -import { GFXRenderPassInfo, GFXRenderPass } from './gfx-render-pass'; -import { GFXPipelineStateInfo, GFXPipelineState } from './gfx-pipeline-state'; -import { GFXPipelineLayoutInfo, GFXPipelineLayout } from './gfx-pipeline-layout'; -import { GFXSamplerInfo, GFXSampler } from './gfx-sampler'; -import { GFXShaderInfo, GFXShader } from './gfx-shader'; -import { GFXInputAssemblerInfo, GFXInputAssembler } from './gfx-input-assembler'; -import { GFXCommandBufferInfo, GFXCommandBuffer } from './gfx-command-buffer'; -import { GFXCommandAllocatorInfo, GFXCommandAllocator } from './gfx-command-allocator'; -import { GFXWindowInfo, GFXWindow } from './gfx-window'; -import { GFXBindingLayoutInfo, GFXBindingLayout } from './gfx-binding-layout'; +import { GFXBuffer, GFXBufferInfo } from './buffer'; +import { GFXQueue, GFXQueueInfo } from './queue'; +import { GFXTexture, GFXTextureInfo } from './texture'; +import { GFXTextureViewInfo, GFXTextureView } from './texture-view'; +import { GFXFramebufferInfo, GFXFramebuffer } from './framebuffer'; +import { GFXRenderPassInfo, GFXRenderPass } from './render-pass'; +import { GFXPipelineStateInfo, GFXPipelineState } from './pipeline-state'; +import { GFXPipelineLayoutInfo, GFXPipelineLayout } from './pipeline-layout'; +import { GFXSamplerInfo, GFXSampler } from './sampler'; +import { GFXShaderInfo, GFXShader } from './shader'; +import { GFXInputAssemblerInfo, GFXInputAssembler } from './input-assembler'; +import { GFXCommandBufferInfo, GFXCommandBuffer } from './command-buffer'; +import { GFXCommandAllocatorInfo, GFXCommandAllocator } from './command-allocator'; +import { GFXWindowInfo, GFXWindow } from './window'; +import { GFXBindingLayoutInfo, GFXBindingLayout } from './binding-layout'; export enum GFXFeature { }; diff --git a/cocos/renderer/gfx/gfx-framebuffer.ts b/cocos/gfx/framebuffer.ts similarity index 80% rename from cocos/renderer/gfx/gfx-framebuffer.ts rename to cocos/gfx/framebuffer.ts index ed394a182f..2be7c4b41c 100644 --- a/cocos/renderer/gfx/gfx-framebuffer.ts +++ b/cocos/gfx/framebuffer.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from './gfx-device'; -import { GFXTextureView } from './gfx-texture-view'; -import { GFXRenderPass } from './gfx-render-pass'; +import { GFXDevice } from './device'; +import { GFXTextureView } from './texture-view'; +import { GFXRenderPass } from './render-pass'; export interface GFXFramebufferInfo { renderPass: GFXRenderPass; diff --git a/cocos/gfx/index.ts b/cocos/gfx/index.ts new file mode 100644 index 0000000000..7ddb6bb1fa --- /dev/null +++ b/cocos/gfx/index.ts @@ -0,0 +1,29 @@ +import { GFXDevice } from './device'; +import { GFXBuffer } from './buffer'; +import { GFXTexture } from './texture'; +import { GFXTextureView } from './texture-view'; +import { GFXSampler } from './sampler'; +import { GFXShader } from './shader'; +import { GFXInputAssembler } from './input-assembler'; +import { GFXRenderPass } from './render-pass'; +import { GFXFramebuffer } from './framebuffer'; +import { GFXPipelineLayout } from './pipeline-layout'; +import { GFXPipelineState } from './pipeline-state'; +import { GFXCommandBuffer } from './command-buffer'; +import { GFXQueue } from './queue'; +import { WebGLGFXDevice } from './webgl/webgl-device'; + +cc.GFXDevice = GFXDevice; +cc.GFXBuffer = GFXBuffer; +cc.GFXTexture = GFXTexture; +cc.GFXTextureView = GFXTextureView; +cc.GFXSampler = GFXSampler; +cc.GFXShader = GFXShader; +cc.GFXInputAssembler = GFXInputAssembler; +cc.GFXRenderPass = GFXRenderPass; +cc.GFXFramebuffer = GFXFramebuffer; +cc.GFXPipelineLayout = GFXPipelineLayout; +cc.GFXPipelineState = GFXPipelineState; +cc.GFXCommandBuffer = GFXCommandBuffer; +cc.GFXQueue = GFXQueue; +cc.WebGLGFXDevice = WebGLGFXDevice; diff --git a/cocos/renderer/gfx/gfx-input-assembler.ts b/cocos/gfx/input-assembler.ts similarity index 94% rename from cocos/renderer/gfx/gfx-input-assembler.ts rename to cocos/gfx/input-assembler.ts index ba4f5adcdb..4d6c87ae50 100644 --- a/cocos/renderer/gfx/gfx-input-assembler.ts +++ b/cocos/gfx/input-assembler.ts @@ -1,7 +1,7 @@ -import { GFXDevice } from './gfx-device'; -import { GFXFormat } from './gfx-define'; -import { GFXBuffer } from './gfx-buffer'; -import { GFXShader } from './gfx-shader'; +import { GFXDevice } from './device'; +import { GFXFormat } from './define'; +import { GFXBuffer } from './buffer'; +import { GFXShader } from './shader'; export interface GFXInputAttribute { name: string; diff --git a/cocos/renderer/gfx/gfx-pipeline-layout.ts b/cocos/gfx/pipeline-layout.ts similarity index 81% rename from cocos/renderer/gfx/gfx-pipeline-layout.ts rename to cocos/gfx/pipeline-layout.ts index 811d3e4afd..e669d95f93 100644 --- a/cocos/renderer/gfx/gfx-pipeline-layout.ts +++ b/cocos/gfx/pipeline-layout.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from './gfx-device'; -import { GFXBindingLayout } from './gfx-binding-layout'; -import { GFXShaderType } from './gfx-shader'; +import { GFXDevice } from './device'; +import { GFXBindingLayout } from './binding-layout'; +import { GFXShaderType } from './shader'; export class GFXPushConstantRange { shaderType : GFXShaderType = GFXShaderType.VERTEX; diff --git a/cocos/renderer/gfx/gfx-pipeline-state.ts b/cocos/gfx/pipeline-state.ts similarity index 96% rename from cocos/renderer/gfx/gfx-pipeline-state.ts rename to cocos/gfx/pipeline-state.ts index aa7af9addd..babe08015c 100644 --- a/cocos/renderer/gfx/gfx-pipeline-state.ts +++ b/cocos/gfx/pipeline-state.ts @@ -1,8 +1,8 @@ -import { GFXDevice } from './gfx-device'; -import { GFXShader } from './gfx-shader'; -import { GFXRenderPass } from './gfx-render-pass'; -import { GFXPipelineLayout } from './gfx-pipeline-layout'; -import { GFXInputAttribute } from './gfx-input-assembler'; +import { GFXDevice } from './device'; +import { GFXShader } from './shader'; +import { GFXRenderPass } from './render-pass'; +import { GFXPipelineLayout } from './pipeline-layout'; +import { GFXInputAttribute } from './input-assembler'; export enum GFXPrimitiveMode { POINT_LIST, diff --git a/cocos/renderer/gfx/gfx-queue.ts b/cocos/gfx/queue.ts similarity index 92% rename from cocos/renderer/gfx/gfx-queue.ts rename to cocos/gfx/queue.ts index 5546eecef3..6ebf7fc77e 100644 --- a/cocos/renderer/gfx/gfx-queue.ts +++ b/cocos/gfx/queue.ts @@ -1,4 +1,4 @@ -import { GFXDevice } from './gfx-device'; +import { GFXDevice } from './device'; export enum GFXQueueType { GRAPHICS, diff --git a/cocos/renderer/gfx/gfx-render-pass.ts b/cocos/gfx/render-pass.ts similarity index 96% rename from cocos/renderer/gfx/gfx-render-pass.ts rename to cocos/gfx/render-pass.ts index ebf94e5594..8dc6b7cd84 100644 --- a/cocos/renderer/gfx/gfx-render-pass.ts +++ b/cocos/gfx/render-pass.ts @@ -1,5 +1,5 @@ -import { GFXFormat, GFXFormatInfo } from './gfx-define'; -import { GFXDevice } from './gfx-device'; +import { GFXFormat, GFXFormatInfo } from './define'; +import { GFXDevice } from './device'; // Enumeration all possible values of operations to be performed on initially Loading a Framebuffer Object. export enum GFXLoadOp diff --git a/cocos/renderer/gfx/gfx-sampler.ts b/cocos/gfx/sampler.ts similarity index 63% rename from cocos/renderer/gfx/gfx-sampler.ts rename to cocos/gfx/sampler.ts index 33f4557c9e..1258adf23c 100644 --- a/cocos/renderer/gfx/gfx-sampler.ts +++ b/cocos/gfx/sampler.ts @@ -1,5 +1,5 @@ -import { GFXDevice } from './gfx-device'; -import { GFXComparisonFunc } from './gfx-pipeline-state'; +import { GFXDevice } from './device'; +import { GFXComparisonFunc } from './pipeline-state'; export enum GFXFilter { NONE, @@ -31,17 +31,17 @@ export class GFXSamplerInfo { mipLODBias : number = 0.0; public compare(state : GFXSamplerInfo) : boolean { - return (this.minFilter === state.minFilter) && - (this.magFilter === state.magFilter) && - (this.mipFilter === state.mipFilter) && - (this.addressU === state.addressU) && - (this.addressV === state.addressV) && - (this.addressW === state.addressW) && - (this.maxAnisotropy === state.maxAnisotropy) && - (this.cmpFunc === state.cmpFunc) && - (this.borderColor === state.borderColor) && - (this.minLOD === state.minLOD) && - (this.maxLOD === state.maxLOD) && + return (this.minFilter === state.minFilter) && + (this.magFilter === state.magFilter) && + (this.mipFilter === state.mipFilter) && + (this.addressU === state.addressU) && + (this.addressV === state.addressV) && + (this.addressW === state.addressW) && + (this.maxAnisotropy === state.maxAnisotropy) && + (this.cmpFunc === state.cmpFunc) && + (this.borderColor === state.borderColor) && + (this.minLOD === state.minLOD) && + (this.maxLOD === state.maxLOD) && (this.mipLODBias === state.mipLODBias); } }; diff --git a/cocos/renderer/gfx/gfx-shader.ts b/cocos/gfx/shader.ts similarity index 91% rename from cocos/renderer/gfx/gfx-shader.ts rename to cocos/gfx/shader.ts index feff85709a..afd54e3ad8 100644 --- a/cocos/renderer/gfx/gfx-shader.ts +++ b/cocos/gfx/shader.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from './gfx-device'; -import { GFXBinding } from './gfx-binding-layout'; -import { GFXType } from './gfx-define'; +import { GFXDevice } from './device'; +import { GFXBinding } from './binding-layout'; +import { GFXType } from './define'; export enum GFXShaderType { VERTEX, diff --git a/cocos/renderer/gfx/gfx-texture-view.ts b/cocos/gfx/texture-view.ts similarity index 91% rename from cocos/renderer/gfx/gfx-texture-view.ts rename to cocos/gfx/texture-view.ts index 4d56e1c12b..bd5dec1cc6 100644 --- a/cocos/renderer/gfx/gfx-texture-view.ts +++ b/cocos/gfx/texture-view.ts @@ -1,6 +1,6 @@ -import { GFXFormat, GFXFormatInfo } from './gfx-define'; -import { GFXDevice } from './gfx-device'; -import { GFXTexture } from './gfx-texture'; +import { GFXFormat, GFXFormatInfo } from './define'; +import { GFXDevice } from './device'; +import { GFXTexture } from './texture'; export enum GFXTextureViewType { TV1D, diff --git a/cocos/renderer/gfx/gfx-texture.ts b/cocos/gfx/texture.ts similarity index 95% rename from cocos/renderer/gfx/gfx-texture.ts rename to cocos/gfx/texture.ts index ba650cc2cc..5d36e5d00c 100644 --- a/cocos/renderer/gfx/gfx-texture.ts +++ b/cocos/gfx/texture.ts @@ -1,5 +1,5 @@ -import { GFXFormat, GFXFormatInfo } from './gfx-define'; -import { GFXDevice } from './gfx-device'; +import { GFXFormat, GFXFormatInfo } from './define'; +import { GFXDevice } from './device'; export enum GFXTextureType { TEX1D, diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-binding-layout.ts b/cocos/gfx/webgl/webgl-binding-layout.ts similarity index 92% rename from cocos/renderer/gfx/webgl/webgl-gfx-binding-layout.ts rename to cocos/gfx/webgl/webgl-binding-layout.ts index 8a484b6712..9e67558ca8 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-binding-layout.ts +++ b/cocos/gfx/webgl/webgl-binding-layout.ts @@ -1,7 +1,7 @@ -import { GFXDevice } from '../gfx-device'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { GFXDevice } from '../device'; +import { WebGLGFXDevice } from './webgl-device'; import { WebGLGPUBindingLayout } from './webgl-gpu-objects'; -import { GFXBindingLayout, GFXBindingLayoutInfo, GFXBindingUnit } from '../gfx-binding-layout'; +import { GFXBindingLayout, GFXBindingLayoutInfo, GFXBindingUnit } from '../binding-layout'; export class WebGLGFXBindingLayout extends GFXBindingLayout { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-buffer.ts b/cocos/gfx/webgl/webgl-buffer.ts similarity index 88% rename from cocos/renderer/gfx/webgl/webgl-gfx-buffer.ts rename to cocos/gfx/webgl/webgl-buffer.ts index 91d752cf48..604e56ed5c 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-buffer.ts +++ b/cocos/gfx/webgl/webgl-buffer.ts @@ -1,8 +1,8 @@ -import { GFXBufferInfo, GFXBuffer, GFXMemoryUsageBit, GFXBufferAccess, GFXBufferAccessBit, GFXBufferUsageBit } from '../gfx-buffer'; -import { GFXDevice } from '../gfx-device'; +import { GFXBufferInfo, GFXBuffer, GFXMemoryUsageBit, GFXBufferAccess, GFXBufferAccessBit, GFXBufferUsageBit } from '../buffer'; +import { GFXDevice } from '../device'; import { WebGLGPUBuffer } from './webgl-gpu-objects'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { BufferView } from '../gfx-define'; +import { WebGLGFXDevice } from './webgl-device'; +import { BufferView } from '../define'; export class WebGLGFXBuffer extends GFXBuffer { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-command-allocator.ts b/cocos/gfx/webgl/webgl-command-allocator.ts similarity index 97% rename from cocos/renderer/gfx/webgl/webgl-gfx-command-allocator.ts rename to cocos/gfx/webgl/webgl-command-allocator.ts index 4c6ba5256b..8d54f06868 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-command-allocator.ts +++ b/cocos/gfx/webgl/webgl-command-allocator.ts @@ -1,9 +1,9 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXCommandAllocator, GFXCommandAllocatorInfo } from '../gfx-command-allocator'; +import { GFXDevice } from '../device'; +import { GFXCommandAllocator, GFXCommandAllocatorInfo } from '../command-allocator'; import { WebGLCmdUpdateBuffer, WebGLCmdBeginRenderPass, WebGLCmdBindInputAssembler, WebGLCmdDraw, WebGLCmdBindPipelineState, WebGLCmdBindBindingLayout, WebGLCmdCopyBufferToTexture } from './webgl-commands'; export class WebGLGFXCommandPool { - + constructor(count: number, increase : number) { this._frees = new Array(count); this._freeIdx = count - 1; @@ -11,7 +11,7 @@ export class WebGLGFXCommandPool { } alloc(clazz: new() => T) : T | null { - + if (this._freeIdx <= 0) { let size = this._frees.length + this._increase; let temp = this._frees; diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-command-buffer.ts b/cocos/gfx/webgl/webgl-command-buffer.ts similarity index 87% rename from cocos/renderer/gfx/webgl/webgl-gfx-command-buffer.ts rename to cocos/gfx/webgl/webgl-command-buffer.ts index 8ad6fc47dc..71a1e3bc91 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-command-buffer.ts +++ b/cocos/gfx/webgl/webgl-command-buffer.ts @@ -1,21 +1,21 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXCommandBuffer, GFXCommandBufferInfo, GFXBufferTextureCopy } from '../gfx-command-buffer'; -import { GFXBuffer } from '../gfx-buffer'; +import { GFXDevice } from '../device'; +import { GFXCommandBuffer, GFXCommandBufferInfo, GFXBufferTextureCopy } from '../command-buffer'; +import { GFXBuffer } from '../buffer'; import { WebGLCmdUpdateBuffer, WebGLCmd, WebGLCmdBeginRenderPass, WebGLCmdPackage, WebGLCmdBindInputAssembler, WebGLCmdBindPipelineState, WebGLCmdDraw, WebGLCmdBindBindingLayout, WebGLCmdCopyBufferToTexture } from './webgl-commands'; -import { WebGLGFXCommandAllocator } from './webgl-gfx-command-allocator'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { WebGLGFXBuffer } from './webgl-gfx-buffer'; -import { GFXFramebuffer } from '../gfx-framebuffer'; -import { WebGLGFXFramebuffer } from './webgl-gfx-framebuffer'; -import { GFXInputAssembler } from '../gfx-input-assembler'; -import { WebGLGFXInputAssembler } from './webgl-gfx-input-assembler'; -import { GFXPipelineState } from '../gfx-pipeline-state'; -import { WebGLGFXPipelineState } from './webgl-gfx-pipeline-state'; -import { GFXBindingLayout } from '../gfx-binding-layout'; -import { WebGLGFXBindingLayout } from './webgl-gfx-binding-layout'; -import { GFXTexture } from '../gfx-texture'; -import { GFXTextureLayout } from '../gfx-render-pass'; -import { WebGLGFXTexture } from './webgl-gfx-texture'; +import { WebGLGFXCommandAllocator } from './webgl-command-allocator'; +import { WebGLGFXDevice } from './webgl-device'; +import { WebGLGFXBuffer } from './webgl-buffer'; +import { GFXFramebuffer } from '../framebuffer'; +import { WebGLGFXFramebuffer } from './webgl-framebuffer'; +import { GFXInputAssembler } from '../input-assembler'; +import { WebGLGFXInputAssembler } from './webgl-input-assembler'; +import { GFXPipelineState } from '../pipeline-state'; +import { WebGLGFXPipelineState } from './webgl-pipeline-state'; +import { GFXBindingLayout } from '../binding-layout'; +import { WebGLGFXBindingLayout } from './webgl-binding-layout'; +import { GFXTexture } from '../texture'; +import { GFXTextureLayout } from '../render-pass'; +import { WebGLGFXTexture } from './webgl-texture'; export class WebGLGFXCommandBuffer extends GFXCommandBuffer { @@ -116,7 +116,7 @@ export class WebGLGFXCommandBuffer extends GFXCommandBuffer { this.cmdPackage.cmds.push(WebGLCmd.DRAW); } } - + public updateBuffer(buffer : GFXBuffer, data : Buffer, offset : number) { let gpuBuffer = (buffer).gpuBuffer; if(gpuBuffer) { @@ -126,7 +126,7 @@ export class WebGLGFXCommandBuffer extends GFXCommandBuffer { cmd.buffer = data.slice(0); cmd.offset = offset; this.cmdPackage.updateBufferCmds.push(cmd); - + this.cmdPackage.cmds.push(WebGLCmd.UPDATE_BUFFER); } } diff --git a/cocos/renderer/gfx/webgl/webgl-commands.ts b/cocos/gfx/webgl/webgl-commands.ts similarity index 99% rename from cocos/renderer/gfx/webgl/webgl-commands.ts rename to cocos/gfx/webgl/webgl-commands.ts index e3fd4097f9..6ee4ffd7a7 100644 --- a/cocos/renderer/gfx/webgl/webgl-commands.ts +++ b/cocos/gfx/webgl/webgl-commands.ts @@ -1,16 +1,16 @@ import { WebGLGPUBuffer, WebGLGPUTexture, WebGLGPUInputAssembler, WebGLGPUFramebuffer, WebGLGPUShader, WebGLGPUInput, WebGLAttrib, WebGLGPUPipelineState, WebGLGPUUniformBlock, WebGLGPUBindingLayout, WebGLGPUUniform, WebGLGPUUniformSampler } from "./webgl-gpu-objects"; -import { WebGLGFXDevice } from "./webgl-gfx-device"; -import { GFXBufferUsageBit, GFXMemoryUsageBit } from "../gfx-buffer"; -import { GFXTextureViewType } from "../gfx-texture-view"; -import { GFXFormatInfos, GFXFormat, WebGLEXT, GFXType, GFX_MAX_VERTEX_ATTRIBUTES, GFXFormatSize, BufferView } from "../gfx-define"; -import { GFXShaderType } from "../gfx-shader"; -import { GFXLoadOp, GFXTextureLayout } from "../gfx-render-pass"; -import { GFXColorMask, GFXCullMode } from "../gfx-pipeline-state"; -import { WebGLGFXCommandAllocator } from "./webgl-gfx-command-allocator"; -import { GFXBindingType } from "../gfx-binding-layout"; +import { WebGLGFXDevice } from "./webgl-device"; +import { GFXBufferUsageBit, GFXMemoryUsageBit } from "../buffer"; +import { GFXTextureViewType } from "../texture-view"; +import { GFXFormatInfos, GFXFormat, WebGLEXT, GFXType, GFX_MAX_VERTEX_ATTRIBUTES, GFXFormatSize, BufferView } from "../define"; +import { GFXShaderType } from "../shader"; +import { GFXLoadOp, GFXTextureLayout } from "../render-pass"; +import { GFXColorMask, GFXCullMode } from "../pipeline-state"; +import { WebGLGFXCommandAllocator } from "./webgl-command-allocator"; +import { GFXBindingType } from "../binding-layout"; import { WebGLTexUnit } from "./webgl-state-cache"; -import { GFXBufferTextureCopy } from "../gfx-command-buffer"; -import { GFXTextureFlagBit } from "../gfx-texture"; +import { GFXBufferTextureCopy } from "../command-buffer"; +import { GFXTextureFlagBit } from "../texture"; function GFXFormatToWebGLType(format: GFXFormat, device : WebGLGFXDevice): GLenum { switch (format) { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-device.ts b/cocos/gfx/webgl/webgl-device.ts similarity index 94% rename from cocos/renderer/gfx/webgl/webgl-gfx-device.ts rename to cocos/gfx/webgl/webgl-device.ts index a2ea99b647..cf15f055df 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-device.ts +++ b/cocos/gfx/webgl/webgl-device.ts @@ -1,38 +1,38 @@ -import { GFXDeviceInfo, GFXDevice } from '../gfx-device'; -import { GFXBuffer, GFXBufferInfo, GFXBufferUsageBit } from '../gfx-buffer'; -import { WebGLGFXBuffer } from './webgl-gfx-buffer'; -import { WebGLGFXQueue } from './webgl-gfx-queue'; +import { GFXDeviceInfo, GFXDevice } from '../device'; +import { GFXBuffer, GFXBufferInfo, GFXBufferUsageBit } from '../buffer'; +import { WebGLGFXBuffer } from './webgl-buffer'; +import { WebGLGFXQueue } from './webgl-queue'; import { WebGLStateCache } from './webgl-state-cache'; import { WebGLGPUBuffer, WebGLGPUObjectType, WebGLGPUTexture, WebGLGPURenderPass, WebGLGPUFramebuffer, WebGLGPUTextureView, WebGLGPUShader, WebGLGPUShaderStage, WebGLGPUSampler, WebGLGPUInputAssembler, WebGLGPUPipelineState, WebGLGPUPipelineLayout, WebGLGPUBindingLayout as WebGLGPUBindingLayout, WebGLGPUBinding } from './webgl-gpu-objects'; import { WebGLCmdFuncUpdateBuffer, WebGLCmdFuncDestroyBuffer, WebGLCmdFuncCreateBuffer, WebGLCmdFuncDestroyTexture, WebGLCmdFuncCreateTexture, WebGLCmdFuncCreateFramebuffer, WebGLCmdFuncDestroyFramebuffer, WebGLCmdFuncCreateShader, WebGLCmdFuncDestroyShader, WebGLCmdFuncCreateInputAssember } from './webgl-commands'; -import { GFXTextureInfo, GFXTextureType, GFXTextureFlagBit, GFXTexture } from '../gfx-texture'; -import { GFXTextureViewType, GFXTextureViewInfo, GFXTextureView } from '../gfx-texture-view'; -import { GFXRenderPassInfo, GFXRenderPass } from '../gfx-render-pass'; -import { GFXFramebufferInfo, GFXFramebuffer } from '../gfx-framebuffer'; -import { WebGLGFXRenderPass } from './webgl-gfx-render-pass'; -import { WebGLGFXTextureView } from './webgl-gfx-texture-view'; -import { WebGLGFXTexture } from './webgl-gfx-texture'; -import { GFXShaderInfo, GFXShader } from '../gfx-shader'; -import { GFXSamplerInfo, GFXFilter, GFXSampler, GFXAddress } from '../gfx-sampler'; -import { WebGLGFXCommandAllocator } from './webgl-gfx-command-allocator'; -import { GFXInputAssemblerInfo, GFXInputAssembler } from '../gfx-input-assembler'; -import { WebGLGFXShader } from './webgl-gfx-shader'; -import { GFXCommandAllocator, GFXCommandAllocatorInfo } from '../gfx-command-allocator'; -import { GFXPipelineStateInfo, GFXPipelineState } from '../gfx-pipeline-state'; -import { WebGLGFXPipelineLayout } from './webgl-gfx-pipeline-layout'; -import { GFXBindingLayoutInfo, GFXBindingUnit, GFXBindingType, GFXBindingLayout } from '../gfx-binding-layout'; -import { WebGLGFXSampler } from './webgl-gfx-sampler'; -import { GFXCommandBufferInfo, GFXCommandBuffer } from '../gfx-command-buffer'; -import { GFXQueueInfo, GFXQueue } from '../gfx-queue'; -import { WebGLGFXCommandBuffer } from './webgl-gfx-command-buffer'; -import { WebGLGFXPipelineState } from './webgl-gfx-pipeline-state'; -import { GFXPipelineLayoutInfo, GFXPipelineLayout } from '../gfx-pipeline-layout'; -import { WebGLGFXFramebuffer } from './webgl-gfx-framebuffer'; -import { WebGLGFXInputAssembler } from './webgl-gfx-input-assembler'; -import { GFXWindowInfo, GFXWindow } from '../gfx-window'; -import { WebGLGFXWindow } from './webgl-gfx-window'; -import { BufferView } from '../gfx-define'; -import { WebGLGFXBindingLayout } from './webgl-gfx-binding-layout'; +import { GFXTextureInfo, GFXTextureType, GFXTextureFlagBit, GFXTexture } from '../texture'; +import { GFXTextureViewType, GFXTextureViewInfo, GFXTextureView } from '../texture-view'; +import { GFXRenderPassInfo, GFXRenderPass } from '../render-pass'; +import { GFXFramebufferInfo, GFXFramebuffer } from '../framebuffer'; +import { WebGLGFXRenderPass } from './webgl-render-pass'; +import { WebGLGFXTextureView } from './webgl-texture-view'; +import { WebGLGFXTexture } from './webgl-texture'; +import { GFXShaderInfo, GFXShader } from '../shader'; +import { GFXSamplerInfo, GFXFilter, GFXSampler, GFXAddress } from '../sampler'; +import { WebGLGFXCommandAllocator } from './webgl-command-allocator'; +import { GFXInputAssemblerInfo, GFXInputAssembler } from '../input-assembler'; +import { WebGLGFXShader } from './webgl-shader'; +import { GFXCommandAllocator, GFXCommandAllocatorInfo } from '../command-allocator'; +import { GFXPipelineStateInfo, GFXPipelineState } from '../pipeline-state'; +import { WebGLGFXPipelineLayout } from './webgl-pipeline-layout'; +import { GFXBindingLayoutInfo, GFXBindingUnit, GFXBindingType, GFXBindingLayout } from '../binding-layout'; +import { WebGLGFXSampler } from './webgl-sampler'; +import { GFXCommandBufferInfo, GFXCommandBuffer } from '../command-buffer'; +import { GFXQueueInfo, GFXQueue } from '../queue'; +import { WebGLGFXCommandBuffer } from './webgl-command-buffer'; +import { WebGLGFXPipelineState } from './webgl-pipeline-state'; +import { GFXPipelineLayoutInfo, GFXPipelineLayout } from '../pipeline-layout'; +import { WebGLGFXFramebuffer } from './webgl-framebuffer'; +import { WebGLGFXInputAssembler } from './webgl-input-assembler'; +import { GFXWindowInfo, GFXWindow } from '../window'; +import { WebGLGFXWindow } from './webgl-window'; +import { BufferView } from '../define'; +import { WebGLGFXBindingLayout } from './webgl-binding-layout'; const WebGLPrimitives: GLenum[] = [ WebGLRenderingContext.POINTS, diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-framebuffer.ts b/cocos/gfx/webgl/webgl-framebuffer.ts similarity index 85% rename from cocos/renderer/gfx/webgl/webgl-gfx-framebuffer.ts rename to cocos/gfx/webgl/webgl-framebuffer.ts index e4cff04ace..08b306d902 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-framebuffer.ts +++ b/cocos/gfx/webgl/webgl-framebuffer.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { GFXFramebuffer, GFXFramebufferInfo } from '../gfx-framebuffer'; +import { GFXDevice } from '../device'; +import { WebGLGFXDevice } from './webgl-device'; +import { GFXFramebuffer, GFXFramebufferInfo } from '../framebuffer'; import { WebGLGPUFramebuffer } from './webgl-gpu-objects'; export class WebGLGFXFramebuffer extends GFXFramebuffer { @@ -14,7 +14,7 @@ export class WebGLGFXFramebuffer extends GFXFramebuffer { if(info.colorViews) { this._colorViews = info.colorViews; } - + this._depthStencilView = info.depthStencilView? info.depthStencilView : null; this._isOffscreen = info.isOffscreen? info.isOffscreen : true; diff --git a/cocos/renderer/gfx/webgl/webgl-gpu-objects.ts b/cocos/gfx/webgl/webgl-gpu-objects.ts similarity index 93% rename from cocos/renderer/gfx/webgl/webgl-gpu-objects.ts rename to cocos/gfx/webgl/webgl-gpu-objects.ts index 62d8e9e1b3..29a29dcdc6 100644 --- a/cocos/renderer/gfx/webgl/webgl-gpu-objects.ts +++ b/cocos/gfx/webgl/webgl-gpu-objects.ts @@ -1,12 +1,12 @@ -import { GFXBufferUsage, GFXBufferUsageBit, GFXMemoryUsage, GFXMemoryUsageBit } from "../gfx-buffer"; -import { GFXTextureType, GFXTextureUsage, GFXTextureUsageBit, GFXTextureFlags, GFXTextureFlagBit } from "../gfx-texture"; -import { GFXTextureViewType } from "../gfx-texture-view"; -import { GFXFormat, GFXType, BufferView } from "../gfx-define"; -import { GFXColorAttachment, GFXDepthStencilAttachment } from "../gfx-render-pass"; -import { GFXShaderType, GFXShaderMacro, GFXUniformBlock, GFXUniformSampler } from "../gfx-shader"; -import { GFXBindingType } from "../gfx-binding-layout"; -import { GFXRasterizerState, GFXDepthStencilState, GFXBlendState } from "../gfx-pipeline-state"; -import { GFXInputAttribute } from "../gfx-input-assembler"; +import { GFXBufferUsage, GFXBufferUsageBit, GFXMemoryUsage, GFXMemoryUsageBit } from "../buffer"; +import { GFXTextureType, GFXTextureUsage, GFXTextureUsageBit, GFXTextureFlags, GFXTextureFlagBit } from "../texture"; +import { GFXTextureViewType } from "../texture-view"; +import { GFXFormat, GFXType, BufferView } from "../define"; +import { GFXColorAttachment, GFXDepthStencilAttachment } from "../render-pass"; +import { GFXShaderType, GFXShaderMacro, GFXUniformBlock, GFXUniformSampler } from "../shader"; +import { GFXBindingType } from "../binding-layout"; +import { GFXRasterizerState, GFXDepthStencilState, GFXBlendState } from "../pipeline-state"; +import { GFXInputAttribute } from "../input-assembler"; export enum WebGLGPUObjectType { UNKNOWN, @@ -155,7 +155,7 @@ export class WebGLGPUUniformBlock { size: number = 0; glUniforms: WebGLGPUUniform[] = []; - isUniformPackage: boolean = false; // Is a single uniform package? + isUniformPackage: boolean = false; // Is a single uniform package? buffer: ArrayBuffer | null = null; // for cache bufferView: DataView | null = null; } diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-input-assembler.ts b/cocos/gfx/webgl/webgl-input-assembler.ts similarity index 86% rename from cocos/renderer/gfx/webgl/webgl-gfx-input-assembler.ts rename to cocos/gfx/webgl/webgl-input-assembler.ts index 21c8382099..bda7373d77 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-input-assembler.ts +++ b/cocos/gfx/webgl/webgl-input-assembler.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXInputAssembler, GFXInputAssemblerInfo } from '../gfx-input-assembler'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { GFXDevice } from '../device'; +import { GFXInputAssembler, GFXInputAssemblerInfo } from '../input-assembler'; +import { WebGLGFXDevice } from './webgl-device'; import { WebGLGPUInputAssembler } from './webgl-gpu-objects'; export class WebGLGFXInputAssembler extends GFXInputAssembler { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-pipeline-layout.ts b/cocos/gfx/webgl/webgl-pipeline-layout.ts similarity index 80% rename from cocos/renderer/gfx/webgl/webgl-gfx-pipeline-layout.ts rename to cocos/gfx/webgl/webgl-pipeline-layout.ts index 6f94a12493..e35e1090ce 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-pipeline-layout.ts +++ b/cocos/gfx/webgl/webgl-pipeline-layout.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXPipelineLayout, GFXPipelineLayoutInfo } from '../gfx-pipeline-layout'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { GFXDevice } from '../device'; +import { GFXPipelineLayout, GFXPipelineLayoutInfo } from '../pipeline-layout'; +import { WebGLGFXDevice } from './webgl-device'; import { WebGLGPUPipelineLayout } from './webgl-gpu-objects'; export class WebGLGFXPipelineLayout extends GFXPipelineLayout { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-pipeline-state.ts b/cocos/gfx/webgl/webgl-pipeline-state.ts similarity index 86% rename from cocos/renderer/gfx/webgl/webgl-gfx-pipeline-state.ts rename to cocos/gfx/webgl/webgl-pipeline-state.ts index 72f7118013..79d379121e 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-pipeline-state.ts +++ b/cocos/gfx/webgl/webgl-pipeline-state.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXPipelineState, GFXPipelineStateInfo } from '../gfx-pipeline-state'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { GFXDevice } from '../device'; +import { GFXPipelineState, GFXPipelineStateInfo } from '../pipeline-state'; +import { WebGLGFXDevice } from './webgl-device'; import { WebGLGPUPipelineState } from './webgl-gpu-objects'; export class WebGLGFXPipelineState extends GFXPipelineState { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-queue.ts b/cocos/gfx/webgl/webgl-queue.ts similarity index 72% rename from cocos/renderer/gfx/webgl/webgl-gfx-queue.ts rename to cocos/gfx/webgl/webgl-queue.ts index 542eb4b375..3e7be907f4 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-queue.ts +++ b/cocos/gfx/webgl/webgl-queue.ts @@ -1,9 +1,9 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXQueueInfo, GFXQueue } from '../gfx-queue'; -import { GFXCommandBuffer } from '../gfx-command-buffer'; -import { WebGLGFXCommandBuffer } from './webgl-gfx-command-buffer'; +import { GFXDevice } from '../device'; +import { GFXQueueInfo, GFXQueue } from '../queue'; +import { GFXCommandBuffer } from '../command-buffer'; +import { WebGLGFXCommandBuffer } from './webgl-command-buffer'; import { WebGLCmdFuncExecuteCmds } from './webgl-commands'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { WebGLGFXDevice } from './webgl-device'; export class WebGLGFXQueue extends GFXQueue { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-render-pass.ts b/cocos/gfx/webgl/webgl-render-pass.ts similarity index 81% rename from cocos/renderer/gfx/webgl/webgl-gfx-render-pass.ts rename to cocos/gfx/webgl/webgl-render-pass.ts index 7276d3d523..46fe4be4c4 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-render-pass.ts +++ b/cocos/gfx/webgl/webgl-render-pass.ts @@ -1,9 +1,9 @@ -import { GFXDevice } from '../gfx-device'; +import { GFXDevice } from '../device'; import { WebGLGPUTexture, WebGLGPURenderPass } from './webgl-gpu-objects'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { GFXTexture, GFXTextureInfo, GFXTextureFlagBit } from '../gfx-texture'; -import { GFXFormatSurfaceSize } from '../gfx-define'; -import { GFXRenderPass, GFXRenderPassInfo } from '../gfx-render-pass'; +import { WebGLGFXDevice } from './webgl-device'; +import { GFXTexture, GFXTextureInfo, GFXTextureFlagBit } from '../texture'; +import { GFXFormatSurfaceSize } from '../define'; +import { GFXRenderPass, GFXRenderPassInfo } from '../render-pass'; export class WebGLGFXRenderPass extends GFXRenderPass { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-sampler.ts b/cocos/gfx/webgl/webgl-sampler.ts similarity index 83% rename from cocos/renderer/gfx/webgl/webgl-gfx-sampler.ts rename to cocos/gfx/webgl/webgl-sampler.ts index 9f98edded1..d4bb5d4484 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-sampler.ts +++ b/cocos/gfx/webgl/webgl-sampler.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXSampler, GFXSamplerInfo } from '../gfx-sampler'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { GFXDevice } from '../device'; +import { GFXSampler, GFXSamplerInfo } from '../sampler'; +import { WebGLGFXDevice } from './webgl-device'; import { WebGLGPUSampler } from './webgl-gpu-objects'; export class WebGLGFXSampler extends GFXSampler { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-shader.ts b/cocos/gfx/webgl/webgl-shader.ts similarity index 85% rename from cocos/renderer/gfx/webgl/webgl-gfx-shader.ts rename to cocos/gfx/webgl/webgl-shader.ts index 4d6a752c38..990b574022 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-shader.ts +++ b/cocos/gfx/webgl/webgl-shader.ts @@ -1,6 +1,6 @@ -import { GFXDevice } from '../gfx-device'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { GFXShader, GFXShaderInfo } from '../gfx-shader'; +import { GFXDevice } from '../device'; +import { WebGLGFXDevice } from './webgl-device'; +import { GFXShader, GFXShaderInfo } from '../shader'; import { WebGLGPUShader } from './webgl-gpu-objects'; export class WebGLGFXShader extends GFXShader { diff --git a/cocos/renderer/gfx/webgl/webgl-state-cache.ts b/cocos/gfx/webgl/webgl-state-cache.ts similarity index 96% rename from cocos/renderer/gfx/webgl/webgl-state-cache.ts rename to cocos/gfx/webgl/webgl-state-cache.ts index 23f65a6f32..dde193308f 100644 --- a/cocos/renderer/gfx/webgl/webgl-state-cache.ts +++ b/cocos/gfx/webgl/webgl-state-cache.ts @@ -1,5 +1,5 @@ -import { GFX_MAX_TEXTURE_UNITS, GFX_MAX_VERTEX_ATTRIBUTES } from "../gfx-define"; -import { GFXRasterizerState, GFXDepthStencilState, GFXBlendState } from "../gfx-pipeline-state"; +import { GFX_MAX_TEXTURE_UNITS, GFX_MAX_VERTEX_ATTRIBUTES } from "../define"; +import { GFXRasterizerState, GFXDepthStencilState, GFXBlendState } from "../pipeline-state"; export interface WebGLTexUnit { @@ -16,7 +16,7 @@ export interface WebGLTexUnit export class WebGLStateCache { glArrayBuffer : WebGLBuffer = 0; glElementArrayBuffer : WebGLBuffer = 0; - texUnit : number = 0; + texUnit : number = 0; glTex2DUnits : WebGLTexUnit[]; glTexCubeUnits : WebGLTexUnit[]; glFramebuffer : WebGLFramebuffer = 0; diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-texture-view.ts b/cocos/gfx/webgl/webgl-texture-view.ts similarity index 87% rename from cocos/renderer/gfx/webgl/webgl-gfx-texture-view.ts rename to cocos/gfx/webgl/webgl-texture-view.ts index 1877a3593f..51debcfc44 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-texture-view.ts +++ b/cocos/gfx/webgl/webgl-texture-view.ts @@ -1,7 +1,7 @@ -import { GFXDevice } from '../gfx-device'; -import { GFXTextureView, GFXTextureViewInfo } from '../gfx-texture-view'; +import { GFXDevice } from '../device'; +import { GFXTextureView, GFXTextureViewInfo } from '../texture-view'; import { WebGLGPUTextureView } from './webgl-gpu-objects'; -import { WebGLGFXDevice } from './webgl-gfx-device'; +import { WebGLGFXDevice } from './webgl-device'; export class WebGLGFXTextureView extends GFXTextureView { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-texture.ts b/cocos/gfx/webgl/webgl-texture.ts similarity index 90% rename from cocos/renderer/gfx/webgl/webgl-gfx-texture.ts rename to cocos/gfx/webgl/webgl-texture.ts index 47d3b53bab..b2133a8c22 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-texture.ts +++ b/cocos/gfx/webgl/webgl-texture.ts @@ -1,8 +1,8 @@ -import { GFXDevice } from '../gfx-device'; +import { GFXDevice } from '../device'; import { WebGLGPUTexture } from './webgl-gpu-objects'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { GFXTexture, GFXTextureInfo, GFXTextureFlagBit } from '../gfx-texture'; -import { GFXFormatSurfaceSize } from '../gfx-define'; +import { WebGLGFXDevice } from './webgl-device'; +import { GFXTexture, GFXTextureInfo, GFXTextureFlagBit } from '../texture'; +import { GFXFormatSurfaceSize } from '../define'; export class WebGLGFXTexture extends GFXTexture { diff --git a/cocos/renderer/gfx/webgl/webgl-gfx-window.ts b/cocos/gfx/webgl/webgl-window.ts similarity index 92% rename from cocos/renderer/gfx/webgl/webgl-gfx-window.ts rename to cocos/gfx/webgl/webgl-window.ts index a1d837a028..e4d0349622 100644 --- a/cocos/renderer/gfx/webgl/webgl-gfx-window.ts +++ b/cocos/gfx/webgl/webgl-window.ts @@ -1,11 +1,11 @@ -import { GFXDevice } from '../gfx-device'; -import { WebGLGFXDevice } from './webgl-gfx-device'; -import { GFXWindow, GFXWindowInfo } from '../gfx-window'; -import { GFXFramebufferInfo } from '../gfx-framebuffer'; -import { GFXRenderPassInfo, GFXColorAttachment, GFXLoadOp, GFXStoreOp, GFXTextureLayout, GFXPipelineBindPoint, GFXDepthStencilAttachment } from '../gfx-render-pass'; -import { GFXTextureType, GFXTextureUsageBit, GFXTextureFlagBit } from '../gfx-texture'; -import { GFXTextureViewType } from '../gfx-texture-view'; -import { GFXFormat } from '../gfx-define'; +import { GFXDevice } from '../device'; +import { WebGLGFXDevice } from './webgl-device'; +import { GFXWindow, GFXWindowInfo } from '../window'; +import { GFXFramebufferInfo } from '../framebuffer'; +import { GFXRenderPassInfo, GFXColorAttachment, GFXLoadOp, GFXStoreOp, GFXTextureLayout, GFXPipelineBindPoint, GFXDepthStencilAttachment } from '../render-pass'; +import { GFXTextureType, GFXTextureUsageBit, GFXTextureFlagBit } from '../texture'; +import { GFXTextureViewType } from '../texture-view'; +import { GFXFormat } from '../define'; export class WebGLGFXWindow extends GFXWindow { diff --git a/cocos/renderer/gfx/gfx-window.ts b/cocos/gfx/window.ts similarity index 84% rename from cocos/renderer/gfx/gfx-window.ts rename to cocos/gfx/window.ts index d949f769ec..f4f60e6ee3 100644 --- a/cocos/renderer/gfx/gfx-window.ts +++ b/cocos/gfx/window.ts @@ -1,9 +1,9 @@ -import { GFXDevice } from './gfx-device'; -import { GFXFramebuffer } from './gfx-framebuffer'; -import { GFXTexture } from './gfx-texture'; -import { GFXTextureView } from './gfx-texture-view'; -import { GFXFormat } from './gfx-define'; -import { GFXRenderPass } from './gfx-render-pass'; +import { GFXDevice } from './device'; +import { GFXFramebuffer } from './framebuffer'; +import { GFXTexture } from './texture'; +import { GFXTextureView } from './texture-view'; +import { GFXFormat } from './define'; +import { GFXRenderPass } from './render-pass'; export interface GFXWindowInfo { title?: string; diff --git a/cocos/renderer/core/constants.js b/cocos/renderer/core/constants.js deleted file mode 100644 index 59e6ca8938..0000000000 --- a/cocos/renderer/core/constants.js +++ /dev/null @@ -1,13 +0,0 @@ -let RenderQueue = { - OPAQUE: 0, - TRANSPARENT: 1, - OVERLAY: 2 -}; - -let PassStage = { - DEFAULT: 1, - FORWARD: 2, - SHADOWCAST: 4 -}; - -export { RenderQueue, PassStage }; diff --git a/cocos/renderer/core/constants.ts b/cocos/renderer/core/constants.ts new file mode 100644 index 0000000000..9001458f58 --- /dev/null +++ b/cocos/renderer/core/constants.ts @@ -0,0 +1,11 @@ +export enum RenderQueue { + OPAQUE = 0, + TRANSPARENT = 1, + OVERLAY = 2 +}; + +export enum PassStage { + DEFAULT = 1, + FORWARD = 2, + SHADOWCAST = 4 +}; diff --git a/cocos/renderer/core/pass.js b/cocos/renderer/core/pass.js deleted file mode 100644 index d1bd128b0b..0000000000 --- a/cocos/renderer/core/pass.js +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. - -import gfx from '../gfx'; -import { PassStage } from './constants'; - -export default class Pass { - constructor(name) { - this._programName = name; - this._stage = PassStage.DEFAULT; - - // cullmode - this._cullMode = gfx.CULL_BACK; - - // blending - this._blend = false; - this._blendEq = gfx.BLEND_FUNC_ADD; - this._blendAlphaEq = gfx.BLEND_FUNC_ADD; - this._blendSrc = gfx.BLEND_SRC_ALPHA; - this._blendDst = gfx.BLEND_ONE_MINUS_SRC_ALPHA; - this._blendSrcAlpha = gfx.BLEND_ONE; - this._blendDstAlpha = gfx.BLEND_ZERO; - this._blendColor = 0xffffffff; - - // depth - this._depthTest = false; - this._depthWrite = false; - this._depthFunc = gfx.DS_FUNC_LESS, - - // stencil - this._stencilTest = false; - // front - this._stencilFuncFront = gfx.DS_FUNC_ALWAYS; - this._stencilRefFront = 0; - this._stencilMaskFront = 0xff; - this._stencilFailOpFront = gfx.STENCIL_OP_KEEP; - this._stencilZFailOpFront = gfx.STENCIL_OP_KEEP; - this._stencilZPassOpFront = gfx.STENCIL_OP_KEEP; - this._stencilWriteMaskFront = 0xff; - // back - this._stencilFuncBack = gfx.DS_FUNC_ALWAYS; - this._stencilRefBack = 0; - this._stencilMaskBack = 0xff; - this._stencilFailOpBack = gfx.STENCIL_OP_KEEP; - this._stencilZFailOpBack = gfx.STENCIL_OP_KEEP; - this._stencilZPassOpBack = gfx.STENCIL_OP_KEEP; - this._stencilWriteMaskBack = 0xff; - } - - setStage(stage = PassStage.DEFAULT) { - this._stage = stage; - } - - setCullMode(cullMode = gfx.CULL_BACK) { - this._cullMode = cullMode; - } - - setBlend( - enabled = false, - blendEq = gfx.BLEND_FUNC_ADD, - blendSrc = gfx.BLEND_SRC_ALPHA, - blendDst = gfx.BLEND_ONE_MINUS_SRC_ALPHA, - blendAlphaEq = gfx.BLEND_FUNC_ADD, - blendSrcAlpha = gfx.BLEND_SRC_ALPHA, - blendDstAlpha = gfx.BLEND_ONE_MINUS_SRC_ALPHA, - blendColor = 0xffffffff - ) { - this._blend = enabled; - this._blendEq = blendEq; - this._blendSrc = blendSrc; - this._blendDst = blendDst; - this._blendAlphaEq = blendAlphaEq; - this._blendSrcAlpha = blendSrcAlpha; - this._blendDstAlpha = blendDstAlpha; - this._blendColor = blendColor; - } - - setDepth( - depthTest = false, - depthWrite = false, - depthFunc = gfx.DS_FUNC_LESS - ) { - this._depthTest = depthTest; - this._depthWrite = depthWrite; - this._depthFunc = depthFunc; - } - - setStencilFront( - enabled = false, - stencilFunc = gfx.DS_FUNC_ALWAYS, - stencilRef = 0, - stencilMask = 0xff, - stencilFailOp = gfx.STENCIL_OP_KEEP, - stencilZFailOp = gfx.STENCIL_OP_KEEP, - stencilZPassOp = gfx.STENCIL_OP_KEEP, - stencilWriteMask = 0xff - ) { - this._stencilTest = enabled; - this._stencilFuncFront = stencilFunc; - this._stencilRefFront = stencilRef; - this._stencilMaskFront = stencilMask; - this._stencilFailOpFront = stencilFailOp; - this._stencilZFailOpFront = stencilZFailOp; - this._stencilZPassOpFront = stencilZPassOp; - this._stencilWriteMaskFront = stencilWriteMask; - } - - setStencilBack( - enabled = false, - stencilFunc = gfx.DS_FUNC_ALWAYS, - stencilRef = 0, - stencilMask = 0xff, - stencilFailOp = gfx.STENCIL_OP_KEEP, - stencilZFailOp = gfx.STENCIL_OP_KEEP, - stencilZPassOp = gfx.STENCIL_OP_KEEP, - stencilWriteMask = 0xff - ) { - this._stencilTest = enabled; - this._stencilFuncBack = stencilFunc; - this._stencilRefBack = stencilRef; - this._stencilMaskBack = stencilMask; - this._stencilFailOpBack = stencilFailOp; - this._stencilZFailOpBack = stencilZFailOp; - this._stencilZPassOpBack = stencilZPassOp; - this._stencilWriteMaskBack = stencilWriteMask; - } -} diff --git a/cocos/renderer/core/pass.ts b/cocos/renderer/core/pass.ts new file mode 100644 index 0000000000..833363baea --- /dev/null +++ b/cocos/renderer/core/pass.ts @@ -0,0 +1,52 @@ +// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + +import { PassStage } from './constants'; +import { GFXBuffer } from '../../gfx/buffer'; +import { GFXSampler } from '../../gfx/sampler'; +import { GFXDevice } from '../../gfx/device'; +import { GFXDepthStencilAttachment, GFXColorAttachment } from '../../gfx/render-pass'; +import { GFXPipelineState, GFXPrimitiveMode, GFXRasterizerState, GFXDepthStencilState, GFXBlendState, GFXInputState } from '../../gfx/pipeline-state'; +import { GFXBindingLayoutInfo } from '../../gfx/binding-layout'; + +interface PassInfo { + programName?: string; + primitive?: GFXPrimitiveMode; + stage?: PassStage; + inputState?: GFXInputState; + rasterizerState?: GFXRasterizerState; + depthStencilState?: GFXDepthStencilState; + blendState?: GFXBlendState; + bindingLayoutInfo?: GFXBindingLayoutInfo; +} + +export default class Pass { + static create(info: PassInfo) { + let pass = new Pass(); + let device = pass._device = cc.game._renderContext; + pass._programName = info.programName || ''; + pass._stage = info.stage || PassStage.DEFAULT; + // pipeline state + pass._pipelineState = device.createPipelineState({ + primitive: info.primitive || GFXPrimitiveMode.TRIANGLE_LIST, + shader: null, + is: Object.assign(new GFXInputState, info.inputState), + rs: Object.assign(new GFXRasterizerState, info.rasterizerState), + dss: Object.assign(new GFXDepthStencilState, info.depthStencilState), + bs: Object.assign(new GFXBlendState, info.blendState), + layout: device.createPipelineLayout({ + layouts: [device.createBindingLayout(info.bindingLayoutInfo || { bindings: [] })] + }), + renderPass: device.createRenderPass({ + colorAttachments: [new GFXColorAttachment], + depthStencilAttachment: new GFXDepthStencilAttachment + }) + }); + } + + protected _device: GFXDevice | null = null; + protected _programName: string = ''; + protected _stage: PassStage = PassStage.DEFAULT; + protected _pipelineState: GFXPipelineState | null = null; + protected _buffers: GFXBuffer[] = []; + protected _samplers: GFXSampler[] = []; +} diff --git a/cocos/renderer/gfx/index.js b/cocos/renderer/gfx/index.js index 56f53282fc..7687de6774 100644 --- a/cocos/renderer/gfx/index.js +++ b/cocos/renderer/gfx/index.js @@ -16,21 +16,6 @@ import RenderBuffer from './render-buffer'; import FrameBuffer from './frame-buffer'; import Device from './device'; -import { GFXDevice } from './gfx-device'; -import { GFXBuffer } from './gfx-buffer'; -import { GFXTexture } from './gfx-texture'; -import { GFXTextureView } from './gfx-texture-view'; -import { GFXSampler } from './gfx-sampler'; -import { GFXShader } from './gfx-shader'; -import { GFXInputAssembler } from './gfx-input-assembler'; -import { GFXRenderPass } from './gfx-render-pass'; -import { GFXFramebuffer } from './gfx-framebuffer'; -import { GFXPipelineLayout } from './gfx-pipeline-layout'; -import { GFXPipelineState } from './gfx-pipeline-state'; -import { GFXCommandBuffer } from './gfx-command-buffer'; -import { GFXQueue } from './gfx-queue'; -import { WebGLGFXDevice } from './webgl/webgl-gfx-device'; - let gfx = { // classes VertexFormat, @@ -53,18 +38,3 @@ Object.assign(gfx, enums); export default gfx; cc.gfx = gfx; - -cc.GFXDevice = GFXDevice; -cc.GFXBuffer = GFXBuffer; -cc.GFXTexture = GFXTexture; -cc.GFXTextureView = GFXTextureView; -cc.GFXSampler = GFXSampler; -cc.GFXShader = GFXShader; -cc.GFXInputAssembler = GFXInputAssembler; -cc.GFXRenderPass = GFXRenderPass; -cc.GFXFramebuffer = GFXFramebuffer; -cc.GFXPipelineLayout = GFXPipelineLayout; -cc.GFXPipelineState = GFXPipelineState; -cc.GFXCommandBuffer = GFXCommandBuffer; -cc.GFXQueue = GFXQueue; -cc.WebGLGFXDevice = WebGLGFXDevice; diff --git a/index.js b/index.js index 6ad1ab6eb3..2543c70a40 100644 --- a/index.js +++ b/index.js @@ -32,6 +32,7 @@ import cc from './predefine'; import './cocos/core'; import './cocos/scene-graph'; import './cocos/renderer'; +import './cocos/gfx'; import './cocos/assets'; import './cocos/load-pipeline';