mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
commit modifed files
This commit is contained in:
@@ -462,7 +462,7 @@ export class Mesh extends Asset {
|
||||
const indices = primitive.indices;
|
||||
|
||||
indexBuffer = gfxDevice.createBuffer({
|
||||
usage: GFXBufferUsageBit.INDEX,
|
||||
usage: GFXBufferUsageBit.INDEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: indices.range.length,
|
||||
stride: getIndexUnitStride(indices.indexUnit),
|
||||
@@ -520,7 +520,7 @@ export class Mesh extends Asset {
|
||||
private _createVertexBuffers (gfxDevice: GFXDevice, data: ArrayBuffer): GFXBuffer[] {
|
||||
return this._struct.vertexBundles.map((vertexBundle) => {
|
||||
const vertexBuffer = gfxDevice.createBuffer({
|
||||
usage: GFXBufferUsageBit.VERTEX,
|
||||
usage: GFXBufferUsageBit.VERTEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: vertexBundle.data.length,
|
||||
stride: vertexBundle.data.length / vertexBundle.verticesCount,
|
||||
|
||||
+1
-1
@@ -123,7 +123,7 @@ export abstract class GFXDevice {
|
||||
|
||||
public abstract initialize (info: IGFXDeviceInfo): boolean;
|
||||
public abstract destroy (): void;
|
||||
public abstract resize (width: number, height: number): void;
|
||||
public abstract resize (width: number, height: number);
|
||||
public abstract createBuffer (info: IGFXBufferInfo): GFXBuffer;
|
||||
public abstract createTexture (info: IGFXTextureInfo): GFXTexture;
|
||||
public abstract createTextureView (info: IGFXTextureViewInfo): GFXTextureView;
|
||||
|
||||
@@ -1885,14 +1885,12 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web
|
||||
const cmd3: WebGLCmdDraw = cmdPackage.drawCmds.array[cmdId];
|
||||
if (gpuInputAssembler && gpuShader) {
|
||||
if (!gpuInputAssembler.gpuIndirectBuffer) {
|
||||
const drawInfo = cmd3.drawInfo as IGFXDrawInfo;
|
||||
|
||||
const gpuBuffer = gpuInputAssembler.gpuIndexBuffer;
|
||||
if (gpuBuffer && drawInfo.indexCount > 0) {
|
||||
const offset = drawInfo.firstIndex * gpuBuffer.stride;
|
||||
gl.drawElements(glPrimitive, drawInfo.indexCount, gpuInputAssembler.glIndexType, offset);
|
||||
if (gpuBuffer && cmd3.drawInfo.indexCount > 0) {
|
||||
const offset = cmd3.drawInfo.firstIndex * gpuBuffer.stride;
|
||||
gl.drawElements(glPrimitive, cmd3.drawInfo.indexCount, gpuInputAssembler.glIndexType, offset);
|
||||
} else {
|
||||
gl.drawArrays(glPrimitive, drawInfo.firstVertex, drawInfo.vertexCount);
|
||||
gl.drawArrays(glPrimitive, cmd3.drawInfo.firstVertex, cmd3.drawInfo.vertexCount);
|
||||
}
|
||||
} else {
|
||||
if (gpuInputAssembler.gpuIndirectBuffer) {
|
||||
|
||||
@@ -173,6 +173,8 @@ export class WebGLGFXWindow extends GFXWindow {
|
||||
}
|
||||
|
||||
public resize (width: number, height: number) {
|
||||
this._width = width;
|
||||
this._height = height;
|
||||
}
|
||||
|
||||
public get webGLDevice (): WebGLGFXDevice {
|
||||
|
||||
@@ -69,7 +69,7 @@ export default class ParticleBatchModel extends Model {
|
||||
|
||||
public _createInputAssembler (): ArrayBuffer {
|
||||
const vertexBuffer = this._device.createBuffer({
|
||||
usage: GFXBufferUsageBit.VERTEX,
|
||||
usage: GFXBufferUsageBit.VERTEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: this._vertSize * this._capacity * 4,
|
||||
stride: this._vertSize,
|
||||
@@ -90,7 +90,7 @@ export default class ParticleBatchModel extends Model {
|
||||
}
|
||||
|
||||
const indexBuffer = this._device.createBuffer({
|
||||
usage: GFXBufferUsageBit.INDEX,
|
||||
usage: GFXBufferUsageBit.INDEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: this._capacity * 6 * Uint16Array.BYTES_PER_ELEMENT,
|
||||
stride: Uint16Array.BYTES_PER_ELEMENT,
|
||||
|
||||
+68
-10
@@ -3,18 +3,31 @@
|
||||
import RecyclePool from '../../3d/memop/recycle-pool';
|
||||
import { CachedArray } from '../../core/memop/cached-array';
|
||||
import { Root } from '../../core/root';
|
||||
import { GFXBindingLayout } from '../../gfx/binding-layout';
|
||||
import { GFXBuffer } from '../../gfx/buffer';
|
||||
import { GFXCommandBuffer } from '../../gfx/command-buffer';
|
||||
import { GFXCommandBufferType, IGFXRect } from '../../gfx/define';
|
||||
import { GFXBufferUsageBit, GFXCommandBufferType, GFXFormat, GFXMemoryUsageBit, IGFXRect } from '../../gfx/define';
|
||||
import { GFXDevice } from '../../gfx/device';
|
||||
import { GFXFramebuffer } from '../../gfx/framebuffer';
|
||||
import { GFXInputAssembler, IGFXInputAttribute } from '../../gfx/input-assembler';
|
||||
import { GFXPipelineLayout } from '../../gfx/pipeline-layout';
|
||||
import { GFXPipelineState } from '../../gfx/pipeline-state';
|
||||
import { Pass } from '../core/pass';
|
||||
import { Camera } from '../scene/camera';
|
||||
import { RenderScene } from '../scene/render-scene';
|
||||
import { UIBatchModel } from './ui-batch-model';
|
||||
|
||||
export interface IUIBufferBatch {
|
||||
vb: GFXBuffer;
|
||||
ib: GFXBuffer;
|
||||
}
|
||||
|
||||
export interface IUIRenderItem {
|
||||
camera: Camera;
|
||||
batchModel: UIBatchModel;
|
||||
cmdBuff: GFXCommandBuffer;
|
||||
pass: Pass;
|
||||
bindingLayout: GFXBindingLayout;
|
||||
pipelineLayout: GFXPipelineLayout;
|
||||
pipelineState: GFXPipelineState;
|
||||
inputAssembler: GFXInputAssembler;
|
||||
}
|
||||
|
||||
export class UI {
|
||||
@@ -32,6 +45,8 @@ export class UI {
|
||||
private _cmdBuff: GFXCommandBuffer | null = null;
|
||||
private _renderArea: IGFXRect = { x: 0, y: 0, width: 0, height: 0 };
|
||||
private _scene: RenderScene;
|
||||
private _attributes: IGFXInputAttribute[] = [];
|
||||
private _bufferBatches: IUIBufferBatch[] = [];
|
||||
private _items: CachedArray<IUIRenderItem>;
|
||||
|
||||
constructor (private _root: Root) {
|
||||
@@ -45,6 +60,14 @@ export class UI {
|
||||
|
||||
public initialize () {
|
||||
|
||||
this._attributes = [
|
||||
{ name: 'a_texCoord', format: GFXFormat.RGB32F },
|
||||
{ name: 'a_position', format: GFXFormat.RG32F },
|
||||
{ name: 'a_color', format: GFXFormat.RGBA8, isNormalized: true },
|
||||
];
|
||||
|
||||
this.createBufferBatch();
|
||||
|
||||
this._cmdBuff = this._device.createCommandBuffer({
|
||||
allocator: this._device.commandAllocator,
|
||||
type: GFXCommandBufferType.PRIMARY,
|
||||
@@ -54,7 +77,12 @@ export class UI {
|
||||
}
|
||||
|
||||
public destroy () {
|
||||
// this._reset();
|
||||
|
||||
for (const buffBatch of this._bufferBatches) {
|
||||
buffBatch.vb.destroy();
|
||||
buffBatch.ib.destroy();
|
||||
}
|
||||
this._bufferBatches = [];
|
||||
|
||||
if (this._cmdBuff) {
|
||||
this._cmdBuff.destroy();
|
||||
@@ -76,10 +104,6 @@ export class UI {
|
||||
this.render();
|
||||
}
|
||||
|
||||
private _emit (): UIBatchModel[] {
|
||||
return this._batchedModels;
|
||||
}
|
||||
|
||||
private render () {
|
||||
if (this._items.length) {
|
||||
const framebuffer = this._root.curWindow!.framebuffer;
|
||||
@@ -97,7 +121,10 @@ export class UI {
|
||||
cmdBuff.beginRenderPass(framebuffer, this._renderArea,
|
||||
[camera.clearColor], camera.clearDepth, camera.clearStencil);
|
||||
|
||||
cmdBuff.execute([item.cmdBuff], 1);
|
||||
cmdBuff.bindPipelineState(item.pipelineState);
|
||||
cmdBuff.bindBindingLayout(item.bindingLayout);
|
||||
cmdBuff.bindInputAssembler(item.inputAssembler);
|
||||
cmdBuff.draw(item.inputAssembler);
|
||||
|
||||
cmdBuff.endRenderPass();
|
||||
}
|
||||
@@ -107,4 +134,35 @@ export class UI {
|
||||
this._device.queue.submit([cmdBuff]);
|
||||
}
|
||||
}
|
||||
|
||||
private createBufferBatch (): IUIBufferBatch {
|
||||
|
||||
const vbStride = Float32Array.BYTES_PER_ELEMENT * 6;
|
||||
|
||||
const vb = this._device.createBuffer({
|
||||
usage: GFXBufferUsageBit.VERTEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: vbStride * 128,
|
||||
stride: vbStride,
|
||||
});
|
||||
|
||||
const ibStride = Uint16Array.BYTES_PER_ELEMENT;
|
||||
|
||||
const ib = this._device.createBuffer({
|
||||
usage: GFXBufferUsageBit.INDEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: ibStride * 128,
|
||||
stride: ibStride,
|
||||
});
|
||||
|
||||
const ia = this._device.createInputAssembler({
|
||||
attributes: this._attributes,
|
||||
vertexBuffers: [vb],
|
||||
indexBuffer: ib,
|
||||
});
|
||||
|
||||
const batch: IUIBufferBatch = { vb, ib };
|
||||
this._bufferBatches.push(batch);
|
||||
return batch;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ export function createIA(device, data) {
|
||||
}
|
||||
|
||||
let vb = device.createBuffer({
|
||||
usage: GFXBufferUsageBit.VERTEX,
|
||||
usage: GFXBufferUsageBit.VERTEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: verts.length * 4,
|
||||
stride: verts.length * 4 / vcount,
|
||||
@@ -47,7 +47,7 @@ export function createIA(device, data) {
|
||||
vb.update(new Float32Array(verts));
|
||||
|
||||
let ib = device.createBuffer({
|
||||
usage: GFXBufferUsageBit.INDEX,
|
||||
usage: GFXBufferUsageBit.INDEX | GFXBufferUsageBit.TRANSFER_DST,
|
||||
memUsage: GFXMemoryUsageBit.HOST | GFXMemoryUsageBit.DEVICE,
|
||||
size: data.indices.length * 2,
|
||||
stride: 2,
|
||||
|
||||
Reference in New Issue
Block a user