#154 webglパッケージをv2へ移行

Next2D · Aug 20, 2024 · 17521e0 · 17521e0
1 parent 241eb60
commit 17521e0
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 26 deletions.
diff --git a/...ay/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.ts b/...ay/src/DisplayObjectContainer/usecase/DisplayObjectContainerGenerateRenderQueueUseCase.ts
@@ -118,7 +118,6 @@ export const execute = <P extends DisplayObjectContainer>(
         }
 
         render_queue.push(child.placeId, child.clipDepth);
-
         switch (true) {
 
             case child.isContainerEnabled: // 0x00

diff --git a/packages/display/src/Shape/usecase/ShapeBuildFromCharacterUseCase.ts b/packages/display/src/Shape/usecase/ShapeBuildFromCharacterUseCase.ts
@@ -27,25 +27,36 @@ export const execute = (shape: Shape, character: IShapeCharacter): void =>
     graphics.yMin = character.bounds.yMin;
     graphics.yMax = character.bounds.yMax;
 
-    if (character.recodes) {
-
-        switch (true) {
-
-            // todo
-
-            default:
-                if (!character.recodeBuffer) {
-                    character.recodeBuffer = new Float32Array(
-                        graphicsToNumberArrayService(width, height, character.recodes)
-                    );
-                    $poolArray(character.recodes);
-                    character.recodes = null;
-                }
-                graphics.buffer = character.recodeBuffer.slice(0);
-                break;
-
-        }
-    } else {
-        // todo
+    switch (true) {
+
+        case character.bitmapId > 0:
+            break;
+
+        case character.inBitmap:
+            break;
+
+        default:
+            switch (true) {
+
+                // todo
+
+                default:
+                    if (character.recodes) {
+                        character.recodeBuffer = new Float32Array(
+                            graphicsToNumberArrayService(width, height, character.recodes)
+                        );
+                        $poolArray(character.recodes);
+                        character.recodes = null;
+                    }
+
+                    if (!character.recodeBuffer) {
+                        break;
+                    }
+
+                    graphics.buffer = character.recodeBuffer.slice(0);
+                    break;
+
+            }
+            break;
     }
 };
diff --git a/packages/display/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.ts b/packages/display/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.ts
@@ -37,7 +37,6 @@ export const execute = (
 ): void => {
 
     render_queue.push($RENDERER_SHAPE_TYPE);
-
     if (!shape.visible) {
         render_queue.push(0);
         return ;
@@ -203,8 +202,8 @@ export const execute = (
     const cacheKey = shape.cacheKey;
 
     render_queue.push(cacheKey);
-    const cachePosition = $cacheStore.get(shape.uniqueKey, `${cacheKey}`);
-    if (!cachePosition) {
+    const cache = $cacheStore.get(shape.uniqueKey, `${cacheKey}`);
+    if (!cache) {
         render_queue.push(0);
 
         const buffer = graphics.buffer;

diff --git a/packages/renderer/src/Command/usecase/CommandRenderUseCase.ts b/packages/renderer/src/Command/usecase/CommandRenderUseCase.ts
@@ -85,4 +85,5 @@ export const execute = (render_queue: Float32Array): void =>
 
     $context.drawArraysInstanced();
     $context.transferMainCanvas();
+    // $context.debug();
 };
diff --git a/packages/renderer/src/Shape/service/ShapeCommandService.ts b/packages/renderer/src/Shape/service/ShapeCommandService.ts
@@ -91,18 +91,22 @@ export const execute = (commands: Float32Array, has_grid: boolean): void =>
                 break;
 
             case GRADIENT_FILL:
+                console.log("GRADIENT_FILL");
                 // todo
                 break;
 
             case GRADIENT_STROKE:
+                console.log("GRADIENT_STROKE");
                 // todo
                 break;
 
             case BITMAP_FILL:
+                console.log("BITMAP_FILL");
                 // todo
                 break;
 
             case BITMAP_STROKE:
+                console.log("BITMAP_STROKE");
                 // todo
                 break;
 

diff --git a/packages/renderer/src/Shape/usecase/ShapeRenderUseCase.ts b/packages/renderer/src/Shape/usecase/ShapeRenderUseCase.ts
@@ -82,7 +82,8 @@ export const execute = (render_queue: Float32Array, index: number): number =>
         const height = Math.ceil(Math.abs(yMax - yMin) * yScale);
 
         node = $context.createNode(width, height);
-
+        $cacheStore.set(uniqueKey, `${cacheKey}`, node);
+
         // 初期化して、描画範囲とmatrix設定
         $context.reset();
         $context.beginNodeRendering(node);
@@ -111,7 +112,6 @@ export const execute = (render_queue: Float32Array, index: number): number =>
         if (!node) {
             return index;
         }
-
     }
 
     const radianX = Math.atan2(matrix[1], matrix[0]);

diff --git a/packages/webgl/src/Context.ts b/packages/webgl/src/Context.ts
@@ -30,6 +30,7 @@ import { execute as blnedDrawArraysInstancedUseCase } from "./Blend/usecase/Blne
 import { execute as vertexArrayObjectBootUseCase } from "./VertexArrayObject/usecase/VertexArrayObjectBootUseCase";
 import { execute as frameBufferManagerTransferMainCanvasService } from "./FrameBufferManager/service/FrameBufferManagerTransferMainCanvasService";
 import { execute as blendEnableUseCase } from "./Blend/usecase/BlendEnableUseCase";
+import { execute as contextDebugService } from "./Context/service/ContextDebugService";
 import { $getAtlasAttachmentObject } from "./AtlasManager";
 import {
     $setReadFrameBuffer,
@@ -702,4 +703,9 @@ export class Context
     {
         frameBufferManagerTransferMainCanvasService();
     }
+
+    debug (): void
+    {
+        contextDebugService();
+    }
 }
diff --git a/packages/webgl/src/Context/service/ContextDebugService.ts b/packages/webgl/src/Context/service/ContextDebugService.ts
@@ -0,0 +1,36 @@
+import { $drawFrameBuffer } from "../../FrameBufferManager";
+import { $context, $gl } from "../../WebGLUtil";
+
+export const execute = (): void =>
+{
+    const currentAttachmentObject = $context.currentAttachmentObject;
+    $context.bind($context.atlasAttachmentObject);
+
+    const width  = $context.$mainAttachmentObject?.width;
+    const height = $context.$mainAttachmentObject?.height;
+
+    // use main Framebuffer
+    $gl.bindFramebuffer(
+        $gl.DRAW_FRAMEBUFFER,
+        null
+    );
+
+    // execute
+    $gl.blitFramebuffer(
+        0, 0, $context.atlasAttachmentObject?.width, $context.atlasAttachmentObject?.height,
+        0, 0, width, height,
+        $gl.COLOR_BUFFER_BIT,
+        $gl.NEAREST
+    );
+
+    // reset
+    $gl.bindFramebuffer(
+        $gl.DRAW_FRAMEBUFFER,
+        $drawFrameBuffer
+    );
+
+    if (currentAttachmentObject) {
+        $context.bind(currentAttachmentObject);
+    }  
+
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,6 @@ export const execute = <P extends DisplayObjectContainer>( @@
             }
             render_queue.push(child.placeId, child.clipDepth);
             switch (true) {
                 case child.isContainerEnabled: // 0x00
@@ Expand Down @@