Skip to content

Commit

Permalink
Merge branch 'mrdoob:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
aardgoose authored Jul 11, 2023
2 parents 231f09c + 28fc642 commit c9f2937
Show file tree
Hide file tree
Showing 32 changed files with 362 additions and 151 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand All @@ -65,7 +65,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-code-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2
uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml
queries: security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2
uses: github/codeql-action/autobuild@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2
uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/read-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Git checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: Install Node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
with:
node-version: 18
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion docs/api/ar/extras/core/ShapePath.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>[name]</h1>

<p class="desc">
يتم استخدام هذه الفئة لتحويل سلسلة من الأشكال إلى مصفوفة من
[page:Path]s، على سبيل المثال شكل SVG إلى مسار (انظر المثال أدناه).
[page:Path]s، على سبيل المثال شكل SVG إلى مسار.
</p>

<h2>المنشئ (Constructor)</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/en/extras/core/ShapePath.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>[name]</h1>

<p class="desc">
This class is used to convert a series of shapes to an array of
[page:Path]s, for example an SVG shape to a path (see the example below).
[page:Path]s, for example an SVG shape to a path.
</p>

<h2>Constructor</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/it/extras/core/ShapePath.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>[name]</h1>

<p class="desc">
Questa classe viene utilizzata per convertire una serie di forme in un array di [page:Path], ad esempio una
forma SVG in un path (vedere l'esempio seguente).
forma SVG in un path.
</p>

<h2>Costruttore</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/zh/extras/core/ShapePath.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h1>形状路径([name])</h1>

<p class="desc">
该类用于转换一系列的形状为一个[page:Path]数组,例如转换SVG中的Path为three.js中的Path(请参阅下方的example)
该类用于转换一系列的形状为一个[page:Path]数组,例如转换SVG中的Path为three.js中的Path。
</p>

<h2>构造函数</h2>
Expand Down
5 changes: 4 additions & 1 deletion docs/examples/en/controls/OrbitControls.html
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ <h3>[property:Float zoomSpeed]</h3>
Speed of zooming / dollying. Default is 1.
</p>


<h3>[property:Boolean zoomToCursor]</h3>
<p>
Setting this property to `true` allows to zoom to the cursor's position. Default is `false`.
</p>

<h2>Methods</h2>

Expand Down
5 changes: 4 additions & 1 deletion docs/examples/ko/controls/OrbitControls.html
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,10 @@ <h3>[property:Float zoomSpeed]</h3>
줌잉(Zooming)과 달링(Dollying)의 속도를 설정합니다. 기본값은 1 입니다.
</p>


<h3>[property:Boolean zoomToCursor]</h3>
<p>
Setting this property to `true` allows to zoom to the cursor's position. Default is `false`.
</p>

<h2>메서드</h2>

Expand Down
5 changes: 4 additions & 1 deletion docs/examples/zh/controls/OrbitControls.html
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ <h3>[property:Float zoomSpeed]</h3>
摄像机缩放的速度,其默认值为1。
</p>


<h3>[property:Boolean zoomToCursor]</h3>
<p>
Setting this property to `true` allows to zoom to the cursor's position. Default is `false`.
</p>

<h2>Methods</h2>

Expand Down
Loading

0 comments on commit c9f2937

Please sign in to comment.