DemiSel
/
encantar-js
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Migrate to A-Frame 1.6.0

customisations
alemart 7 个月前
父节点
11684ba362
当前提交
c2874d3f0d
共有 3 个文件被更改，包括 7 次插入 和 7 次删除
合并视图 显示文件统计
  1. 3
    3
      demos/hello-aframe/index.html
  2. 3
    3
      demos/hello-aframe/video.html
  3. 1
    1
      plugins/aframe-with-encantar.js

+ 3
- 3
demos/hello-aframe/index.html 查看文件

6 
         <title>encantar.js WebAR demo with A-Frame</title>
 6 
         <title>encantar.js WebAR demo with A-Frame</title>
7 
         <link href="../assets/demo.css" rel="stylesheet">
 7 
         <link href="../assets/demo.css" rel="stylesheet">
8 
         <script src="../../dist/encantar.min.js"></script>
 8 
         <script src="../../dist/encantar.min.js"></script>
9 
-        <script src="https://cdn.jsdelivr.net/npm/aframe@1.4.2/dist/aframe-v1.4.2.min.js"></script>
9 
+        <script src="https://cdn.jsdelivr.net/npm/aframe@1.6.0/dist/aframe-v1.6.0.min.js"></script>
10 
         <script src="../../plugins/aframe-with-encantar.js"></script>
 10 
         <script src="../../plugins/aframe-with-encantar.js"></script>
11 
         <script src="../../plugins/extras/aframe-scan-gimmick-for-encantar.js"></script>
 11 
         <script src="../../plugins/extras/aframe-scan-gimmick-for-encantar.js"></script>
12 
         <script src="../../plugins/extras/aframe-gltf-anim.js"></script>
 12 
         <script src="../../plugins/extras/aframe-gltf-anim.js"></script>
89 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
 89 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
90
90
91 
                     <!-- Light -->
 91 
                     <!-- Light -->
92 
-                    <a-light type="ambient" intensity="1.5"></a-light>
92 
+                    <a-light type="ambient" intensity="1.0"></a-light>
93
93
94 
                     <!-- 3D model -->
 94 
                     <!-- 3D model -->
95 
                     <a-entity
 95 
                     <a-entity
110 
             <!-- The cat -->
 110 
             <!-- The cat -->
111 
             <ar-root reference-image="cat">
 111 
             <ar-root reference-image="cat">
112 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
 112 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
113 
-                    <a-light type="ambient" intensity="1.5"></a-light>
113 
+                    <a-light type="ambient" intensity="1.0"></a-light>
114
114
115 
                     <a-entity
 115 
                     <a-entity
116 
                         gltf-model="#cat-model" gltf-anim="clip: Cheer"
 116 
                         gltf-model="#cat-model" gltf-anim="clip: Cheer"

+ 3
- 3
demos/hello-aframe/video.html 查看文件

6 
         <title>encantar.js WebAR demo with A-Frame</title>
 6 
         <title>encantar.js WebAR demo with A-Frame</title>
7 
         <link href="../assets/demo.css" rel="stylesheet">
 7 
         <link href="../assets/demo.css" rel="stylesheet">
8 
         <script src="../../dist/encantar.min.js"></script>
 8 
         <script src="../../dist/encantar.min.js"></script>
9 
-        <script src="https://cdn.jsdelivr.net/npm/aframe@1.4.2/dist/aframe-v1.4.2.min.js"></script>
9 
+        <script src="https://cdn.jsdelivr.net/npm/aframe@1.6.0/dist/aframe-v1.6.0.min.js"></script>
10 
         <script src="../../plugins/aframe-with-encantar.js"></script>
 10 
         <script src="../../plugins/aframe-with-encantar.js"></script>
11 
         <script src="../../plugins/extras/aframe-scan-gimmick-for-encantar.js"></script>
 11 
         <script src="../../plugins/extras/aframe-scan-gimmick-for-encantar.js"></script>
12 
         <script src="../../plugins/extras/aframe-gltf-anim.js"></script>
 12 
         <script src="../../plugins/extras/aframe-gltf-anim.js"></script>
89 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
 89 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
90
90
91 
                     <!-- Light -->
 91 
                     <!-- Light -->
92 
-                    <a-light type="ambient" intensity="1.5"></a-light>
92 
+                    <a-light type="ambient" intensity="1.0"></a-light>
93
93
94 
                     <!-- 3D model -->
 94 
                     <!-- 3D model -->
95 
                     <a-entity
 95 
                     <a-entity
110 
             <!-- The cat -->
 110 
             <!-- The cat -->
111 
             <ar-root reference-image="cat">
 111 
             <ar-root reference-image="cat">
112 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
 112 
                 <a-entity rotation="-90 0 0" position="0 -0.8 0">
113 
-                    <a-light type="ambient" intensity="1.5"></a-light>
113 
+                    <a-light type="ambient" intensity="1.0"></a-light>
114
114
115 
                     <a-entity
 115 
                     <a-entity
116 
                         gltf-model="#cat-model" gltf-anim="clip: Cheer"
 116 
                         gltf-model="#cat-model" gltf-anim="clip: Cheer"

+ 1
- 1
plugins/aframe-with-encantar.js 查看文件

9 
 /* Usage of the indicated versions is encouraged */
 9 
 /* Usage of the indicated versions is encouraged */
10 
 __THIS_PLUGIN_HAS_BEEN_TESTED_WITH__({
 10 
 __THIS_PLUGIN_HAS_BEEN_TESTED_WITH__({
11 
     'encantar.js': { version: '0.4.1' },
 11 
     'encantar.js': { version: '0.4.1' },
12 
-        'A-Frame': { version: '1.4.2' }
12 
+        'A-Frame': { version: '1.6.0' }
13 
 });
 13 
 });
14
14
15 
 /**
 15 
 /**

撰写 预览
正在加载...
取消
保存