Skip to content

Commit

Permalink
merging dev
Browse files Browse the repository at this point in the history
  • Loading branch information
elalish committed Oct 11, 2022
2 parents eb67540 + c63283a commit a0ab95b
Show file tree
Hide file tree
Showing 1,894 changed files with 106,613 additions and 55,279 deletions.
6 changes: 6 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ This script will start a local server similar to [threejs.org](https://threejs.o

The next most important script runs all the appropriate testing. The E-2-E testing is intended to be run by github actions.

Run this command from the root folder to install test dependencies.

npm install --prefix test

And run tests.

npm test

The linting is there to keep a consistent code style across all of the code and the testing is there to help catch bugs and check that the code behaves as expected. It is important that neither of these steps comes up with any errors due to your changes.
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

github: [mrdoob, HumanInteractive, donmccurdy]
github: [mrdoob, HumanInteractive, donmccurdy, gkjohnson, WestLangley]
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Steps to reproduce the behavior:

***Live example***

* [jsfiddle-latest-release](https://jsfiddle.net/hyok6tvj/)
* [jsfiddle-dev](https://jsfiddle.net/c5m1kazu/)
* [jsfiddle-latest-release](https://jsfiddle.net/hbfpj2wv/2/)
* [jsfiddle-dev](https://jsfiddle.net/086yzvgc/)

**Expected behavior**

Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ A clear and concise description of what the problem was and how this pull reques

<!-- Remove the line below if is not relevant -->

This contribution is funded by [Example](https://example.com).
*This contribution is funded by [Example](https://example.com)*
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
- 'docs/**'
- 'files/**'

permissions:
contents: read

jobs:

lint:
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
three.js
========
# three.js

[![NPM Package][npm]][npm-url]
[![Build Size][build-size]][build-size-url]
[![NPM Downloads][npm-downloads]][npmtrends-url]
[![DeepScan][deepscan]][deepscan-url]
[![Discord][discord]][discord-url]

#### JavaScript 3D library ####
#### JavaScript 3D library

The aim of the project is to create an easy to use, lightweight, cross-browser, general purpose 3D library. The current builds only include a WebGL renderer but WebGPU (experimental), SVG and CSS3D renderers are also available in the examples.

[Examples](https://threejs.org/examples/) &mdash;
[Documentation](https://threejs.org/docs/) &mdash;
[Docs](https://threejs.org/docs/) &mdash;
[Manual](https://threejs.org/manual/) &mdash;
[Wiki](https://github.com/mrdoob/three.js/wiki) &mdash;
[Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) &mdash;
[Questions](https://stackoverflow.com/questions/tagged/three.js) &mdash;
[Forum](https://discourse.threejs.org/) &mdash;
[Slack](https://join.slack.com/t/threejs/shared_invite/zt-rnuegz5e-FQpc6YboDVW~5idlp7GfDw)
[Discord](https://discord.gg/56GBJwAnUS)

### Usage ###
### Usage

This code creates a scene, a camera, and a geometric cube, and it adds the cube to the scene. It then creates a `WebGL` renderer for the scene and camera, and it adds that viewport to the `document.body` element. Finally, it animates the cube within the scene for the camera.

Expand Down Expand Up @@ -58,15 +58,15 @@ function animation( time ) {

If everything went well, you should see [this](https://jsfiddle.net/7u84j6kp/).

### Cloning this repository ###
### Cloning this repository

Cloning the repo with all its history results in a ~2 GB download. If you don't need the whole history you can use the `depth` parameter to significantly reduce download size.

```sh
git clone --depth=1 https://github.com/mrdoob/three.js.git
```

### Change log ###
### Change log

[Releases](https://github.com/mrdoob/three.js/releases)

Expand Down
Loading

0 comments on commit a0ab95b

Please sign in to comment.