@cyclonium/debug-draw 0.0.105 → 1.0.1

package/lib/index.js

@@ -24,12 +24,12 @@ DebugDrawTarget = __decorate([
 ], DebugDrawTarget);
 export { DebugDrawTarget };
 export function tryGetDebugGeometryRenderer(camera) {
-    let renderCamera = undefined;
+    let renderCamera;
     if (camera) {
         renderCamera = camera.camera;
     }
     else if (EDITOR_NOT_IN_PREVIEW) {
-        renderCamera = globalThis.cce?.Camera.camera.camera;
+        renderCamera = getEditorCamera()?.camera;
     }
     else {
         renderCamera = find('World/Main Camera')?.getComponent(Camera)?.camera;
@@ -65,7 +65,7 @@ function getGeometryRendererFromCamera(camera) {
 const cacheAABB = new geometry.AABB();
 export class DebugDrawContext {
     static fromEditorCamera() {
-        const camera = globalThis.cce?.Camera.camera;
+        const camera = getEditorCamera();
         if (!camera) {
             return undefined;
         }
@@ -99,7 +99,7 @@ export class DebugDrawContext {
         Vec3.scaleAndAdd(v2, v2, right, -hx);
         const v3 = Vec3.scaleAndAdd(vec3Caches[iVec3Cache++], center, up, -hy);
         Vec3.scaleAndAdd(v3, v3, right, -hx);
-        const v4 = Vec3.scaleAndAdd(vec3Caches[iVec3Cache++], center, right, hx);
+        const v4 = Vec3.scaleAndAdd(vec3Caches[iVec3Cache], center, right, hx);
         Vec3.scaleAndAdd(v4, v4, up, -hy);
         if (transform) {
             Vec3.transformMat4(v1, v1, transform);
@@ -174,12 +174,12 @@ export class DebugDrawContext {
             Mat4.multiply(finalTransform, transform, finalTransform);
         }
         this._geometryRenderers.forEach((g) => {
-            g.addArc(Vec3.ZERO, radius, color, toDegrees(startAngle), toDegrees(endAngle), segments, depthTest, true, finalTransform);
+            g.addArc(Vec3.ZERO, radius, color, toDegrees(startAngle), toDegrees(endAngle), segments, depthTest, wireframe, finalTransform);
         });
     }
     sector(opts) {
         let iCacheMat4 = 0;
-        let iCacheQuat = 0;
+        const iCacheQuat = 0;
         let iCacheVec3 = 0;
         const { center, radius, halfVector = Vec3.UNIT_Z, halfAngle = Math.PI / 2, normal = Vec3.UNIT_Y, color = Color.BLACK, wireframe = false, depthTest, segments = 64, transform, unlit = false, } = opts;
         const finalTransform = Mat4.identity(mat4Caches[iCacheMat4++]);
@@ -191,9 +191,9 @@ export class DebugDrawContext {
             const inputNormal = Vec3.normalize(vec3Caches[iCacheVec3++], normal);
             const cross = Vec3.cross(vec3Caches[iCacheVec3++], inputHalfVector, inputNormal).normalize();
             const newY = Vec3.cross(vec3Caches[iCacheVec3++], cross, inputHalfVector).normalize();
-            const newX = Vec3.transformQuat(vec3Caches[iCacheVec3++], inputHalfVector, Quat.fromAxisAngle(quatCaches[iCacheQuat++], newY, halfAngle));
-            const newZ = Vec3.cross(vec3Caches[iCacheVec3++], newX, newY).normalize();
-            const newMat4 = mat4FromAxes(mat4Caches[iCacheMat4++], newX, newY, newZ);
+            const newX = Vec3.transformQuat(vec3Caches[iCacheVec3++], inputHalfVector, Quat.fromAxisAngle(quatCaches[iCacheQuat], newY, halfAngle));
+            const newZ = Vec3.cross(vec3Caches[iCacheVec3], newX, newY).normalize();
+            const newMat4 = mat4FromAxes(mat4Caches[iCacheMat4], newX, newY, newZ);
             Mat4.multiply(finalTransform, newMat4, finalTransform);
         }
         // Translate
@@ -210,6 +210,10 @@ export class DebugDrawContext {
     }
     _geometryRenderers;
 }
+function getEditorCamera() {
+    const editorGlobal = globalThis;
+    return editorGlobal.cce?.Camera.camera;
+}
 function mat4FromAxes(mat4, xAxis, yAxis, zAxis) {
     return Mat4.set(mat4, xAxis.x, xAxis.y, xAxis.z, 0, yAxis.x, yAxis.y, yAxis.z, 0, zAxis.x, zAxis.y, zAxis.z, 0, 0, 0, 0, 1);
 }

package/lib/legacy.d.ts

@@ -1,6 +1,6 @@
-import { Mat3 } from "@cyclonium/core/math/mat3";
-import { Vec2 } from "@cyclonium/core/math/vec2";
-import { Mat4, type GeometryRenderer, type Color, Vec3 } from "cc";
+import { Mat3 } from '@cyclonium/core/math/mat3';
+import { Vec2 } from '@cyclonium/core/math/vec2';
+import { Mat4, type GeometryRenderer, type Color, Vec3 } from 'cc';
 export declare const drawBox2D: (geometryRenderer: GeometryRenderer, center: Readonly<Vec2>, halfExtent: Readonly<Vec2> | number, color: Readonly<Color>, { wireframe, depthTest, z, transform, }?: {
     wireframe?: boolean;
     depthTest?: boolean;

package/lib/legacy.js

@@ -1,7 +1,7 @@
-import { Mat3 } from "@cyclonium/core/math/mat3";
-import { decomposeSRTMat3 } from "@cyclonium/core/math/transform-2d";
-import { Vec2 } from "@cyclonium/core/math/vec2";
-import { Mat4, Quat, Vec3 } from "cc";
+import { Mat3 } from '@cyclonium/core/math/mat3';
+import { decomposeSRTMat3 } from '@cyclonium/core/math/transform-2d';
+import { Vec2 } from '@cyclonium/core/math/vec2';
+import { Mat4, Quat, Vec3 } from 'cc';
 export const drawBox2D = (() => {
     return (geometryRenderer, center, halfExtent, color, { wireframe = true, depthTest = true, z = 0, transform, } = {}) => {
         const hx = typeof halfExtent === 'number' ? halfExtent : halfExtent.x;
@@ -22,7 +22,7 @@ export const drawBox2D = (() => {
 export const drawCircleXY = (() => {
     const transform = Mat4.fromQuat(new Mat4(), Quat.fromAxisAngle(new Quat(), Vec3.UNIT_X, Math.PI / 2));
     return (geometryRenderer, center, radius, color, { wireframe = true, depthTest = true, segments = 32, } = {}) => {
-        geometryRenderer.addCircle(center, radius, color, segments, depthTest, true, transform);
+        geometryRenderer.addCircle(center, radius, color, segments, depthTest, wireframe, transform);
     };
 })();
 export const drawLineFromTo2D = (() => {
@@ -69,7 +69,7 @@ export const drawCircle2D = (() => {
             const transform4 = Mat4.fromSRT(new Mat4(), Quat.fromAxisAngle(new Quat(), Vec3.UNIT_Z, srt.rotation), new Vec3(srt.translation.x, srt.translation.y, z), new Vec3(srt.scale.x, srt.scale.y, z));
             Mat4.multiply(transformMatrix, transform4, transformMatrix);
         }
-        geometryRenderer.addCircle(center3, radius, color, segments, depthTest, true, transformMatrix);
+        geometryRenderer.addCircle(center3, radius, color, segments, depthTest, wireframe, transformMatrix);
     };
 })();
 //# sourceMappingURL=legacy.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonium/debug-draw",
-  "version": "0.0.105",
+  "version": "1.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/shrinktofit/cyclonium",
@@ -17,7 +17,7 @@
     "@cyclonium/algorithm": "1.0.0"
   },
   "peerDependencies": {
-    "@cyclonium/core": "0.0.105"
+    "@cyclonium/core": "1.0.1"
   },
   "devDependencies": {
     "typescript": "^6.0.2",