Skip to content

Commit

Permalink
Merge pull request #6 from AmyangXYZ/jem/features
Browse files Browse the repository at this point in the history
Jem/features
  • Loading branch information
AmyangXYZ authored Dec 27, 2023
2 parents 988e8f6 + 9fc85d1 commit 349ed44
Show file tree
Hide file tree
Showing 25 changed files with 5,384 additions and 13 deletions.
34 changes: 26 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"@vitejs/plugin-vue-jsx": "^3.0.1",
"@vueuse/components": "^10.1.2",
"@vueuse/core": "^10.1.2",
"echarts": "^5.4.2",
"echarts": "^5.4.3",
"echarts-gl": "^2.0.9",
"element-plus": "^2.3.6",
"three": "^0.154.0",
"vue": "^3.3.4",
Expand Down
11 changes: 11 additions & 0 deletions public/models/robotic_arm/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Model Information:
* title: Robotic Arm - Brazo Robotico
* source: https://sketchfab.com/3d-models/robotic-arm-brazo-robotico-e10b8ba5105b4d5c9ff5ba3de5e649c3
* author: pcorralr (https://sketchfab.com/pcorralr)

Model License:
* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
* requirements: Author must be credited. Commercial use is allowed.

If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
This work is based on "Robotic Arm - Brazo Robotico" (https://sketchfab.com/3d-models/robotic-arm-brazo-robotico-e10b8ba5105b4d5c9ff5ba3de5e649c3) by pcorralr (https://sketchfab.com/pcorralr) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
Binary file added public/models/robotic_arm/scene.bin
Binary file not shown.
Loading

0 comments on commit 349ed44

Please sign in to comment.