Skip to content

Commit

Permalink
Merge pull request #246 from JujieX/fix/controlIput
Browse files Browse the repository at this point in the history
Feat: archive 1.0.0
  • Loading branch information
JujieX authored Dec 26, 2023
2 parents 7f9b355 + bf12ff2 commit d0465e3
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 38 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-root",
"version": "1.1.0-beta.2",
"version": "1.0.0",
"private": true,
"workspaces": [
"packages/*"
Expand Down Expand Up @@ -47,7 +47,7 @@
"husky": "^4.3.8",
"lint-staged": "^10.5.4",
"nyc": "^15.1.0",
"@galacean/engine": "^1.1.0-beta",
"@galacean/engine": "^1.0.0",
"prettier": "^2.7.1",
"rollup": "^3",
"rollup-plugin-binary2base64": "1.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/auxiliary-lines/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-auxiliary-lines",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,7 +24,7 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
},
"dependencies": {
"@galacean/engine-toolkit-custom-material": "workspace:*"
Expand Down
4 changes: 2 additions & 2 deletions packages/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-controls",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"publishConfig": {
"access": "public",
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/custom-material/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-custom-material",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"b:types": "tsc",
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/framebuffer-picker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-framebuffer-picker",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"module": "dist/es/index.js",
"main": "dist/commonjs/browser.js",
Expand All @@ -23,6 +23,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/galacean-engine-toolkit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"b:types": "tsc"
Expand Down
4 changes: 2 additions & 2 deletions packages/geometry-sketch/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-geometry-sketch",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/gizmo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-gizmo",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,7 +24,7 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
},
"dependencies": {
"@galacean/engine-toolkit-framebuffer-picker": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/input-logger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-input-logger",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/lines/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-lines",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/navigation-gizmo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-navigation-gizmo",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,7 +24,7 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
},
"dependencies": {
"@galacean/engine-toolkit-controls": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/outline/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-outline",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"module": "dist/es/index.js",
"main": "dist/commonjs/browser.js",
Expand All @@ -23,6 +23,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/skeleton-viewer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-skeleton-viewer",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"b:types": "tsc"
Expand All @@ -23,6 +23,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
24 changes: 15 additions & 9 deletions packages/skeleton-viewer/src/SkeletonViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,31 +159,37 @@ export class SkeletonViewer extends Script {
}

private _showSkeleton(renderer: SkinnedMeshRenderer): void {
const bones = renderer.bones;
// @ts-ignore
if (!renderer._jointEntities) {
renderer.update(0);
}
// @ts-ignore
const joints: Entity[] = renderer._jointEntities;

const spheres: Entity[][] = [];

let maxLength = 0;

for (let i = 0; i < bones.length; i++) {
const bone = bones[i];
const anchorPoint = bone.transform.worldPosition;
for (let i = 0; i < joints.length; i++) {
const joint = joints[i];
const anchorPoint = joint.transform.worldPosition;

// 球
const entity = bone.createChild();
const entity = joint.createChild();
const renderer = entity.addComponent(MeshRenderer);
renderer.receiveShadows = false;
renderer.castShadows = false;
renderer.mesh = PrimitiveMesh.createSphere(this.engine, this.ballSize, 16);
renderer.setMaterial(this._material);
renderer.priority = 1;

spheres.push([entity, bone]);
spheres.push([entity, joint]);

this._debugMesh.push(renderer);

// 连接体
for (let j = 0; j < bone.children.length; j++) {
const child = bone.children[j];
for (let j = 0; j < joint.childCount; j++) {
const child = joint.children[j];
const childPoint = child.transform.worldPosition;
const absoluteDirection = childPoint.clone().subtract(anchorPoint);
const direction = child.transform.position;
Expand All @@ -193,7 +199,7 @@ export class SkeletonViewer extends Script {
maxLength = distance;
}

const entity = bone;
const entity = joint;
const renderer = entity.addComponent(MeshRenderer);
renderer.receiveShadows = false;
renderer.castShadows = false;
Expand Down
4 changes: 2 additions & 2 deletions packages/stats/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-stats",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"b:types": "tsc"
Expand All @@ -23,6 +23,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/way-point/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galacean/engine-toolkit-way-point",
"version": "1.1.0-beta.4",
"version": "1.0.0",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand All @@ -24,6 +24,6 @@
"types/**/*"
],
"peerDependencies": {
"@galacean/engine": "^1.1.0-beta"
"@galacean/engine": "^1.0.0"
}
}

0 comments on commit d0465e3

Please sign in to comment.