Skip to content

Commit

Permalink
Updated dependencies and fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Kai Salmen committed Apr 19, 2024
1 parent fc48dee commit 36ea130
Show file tree
Hide file tree
Showing 8 changed files with 261 additions and 416 deletions.
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"recommendations": [
"editorconfig.editorconfig",
"dbaeumer.vscode-eslint",
"davidanson.vscode-markdownlint",
"zixuanchen.vitest-explorer"
"davidanson.vscode-markdownlint"
]
}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changelog

## 6.2.1 - 2024-04-19

- Update three.js from v0.160.0 to v0.163.0
- Update other dependencies
- Update all devDependencies with exception of eslint

## 6.2.1 - 2024-01-05

Expand Down
625 changes: 234 additions & 391 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
"keywords": [],
"homepage": "https://github.com/kaisalmen/WWOBJLoader#README",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "~6.18.0",
"@types/node": "~20.10.6",
"@typescript-eslint/eslint-plugin": "~7.7.0",
"@types/node": "~20.12.7",
"@types/shelljs": "~0.8.15",
"editorconfig": "~2.0.0",
"eslint": "~8.56.0",
"shelljs": "~0.8.5",
"shx": "~0.3.4",
"typedoc": "~0.25.6",
"typedoc": "~0.25.13",
"typedoc-plugin-markdown": "~3.17.1",
"typescript": "~5.3.3",
"vite": "~5.0.11",
"vitest": "~1.1.3"
"typescript": "~5.4.5",
"vite": "~5.2.9",
"vitest": "~1.5.0"
},
"volta": {
"node": "20.10.0",
"npm": "10.2.3"
"node": "20.12.2",
"npm": "10.5.0"
},
"workspaces": [
"packages/objloader2",
Expand Down
6 changes: 3 additions & 3 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"verify": "http-server --port 20001 ./"
},
"volta": {
"node": "20.10.0",
"npm": "10.2.3"
"node": "20.12.2",
"npm": "10.5.0"
},
"dependencies": {
"@react-three/fiber": "~8.15.13",
"@react-three/fiber": "~8.16.2",
"wtd-core": "~3.0.0",
"wwobjloader2": "~6.2.1",
"lil-gui": "~0.19.1",
Expand Down
14 changes: 7 additions & 7 deletions packages/examples/src/examples/ExampleCommons.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AmbientLight, DirectionalLight, GridHelper, PerspectiveCamera, Scene, WebGLRenderer } from 'three';
import { AmbientLight, DirectionalLight, GridHelper, PerspectiveCamera, Scene, Vector3, WebGLRenderer } from 'three';
import { TrackballControls } from 'three/examples/jsm/controls/TrackballControls.js';
import { OffscreenPayload } from 'wtd-core';

export type CameraDefaults = {
posCamera: THREE.Vector3;
posCameraTarget: THREE.Vector3;
posCamera: Vector3;
posCameraTarget: Vector3;
near: number;
far: number;
fov: number;
Expand Down Expand Up @@ -56,12 +56,12 @@ export const executeExample = (app: ExampleDefinition) => {
};

export type ThreeDefaultSetup = {
renderer: THREE.WebGLRenderer;
renderer: WebGLRenderer;
canvas: HTMLCanvasElement;
canvasDimensions: CanvasDimensions;
scene: THREE.Scene;
camera: THREE.PerspectiveCamera;
cameraTarget: THREE.Vector3;
scene: Scene;
camera: PerspectiveCamera;
cameraTarget: Vector3;
cameraDefaults: CameraDefaults;
controls?: TrackballControls;
}
Expand Down
6 changes: 4 additions & 2 deletions packages/objloader2/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# OBJLoader2 & OBJLoader2Parallel for three.js

[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/kaisalmen/WWOBJLoader/blob/dev/LICENSE)
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kaisalmen/WWOBJLoader)
[![WWOBJLoader](https://github.com/kaisalmen/WWOBJLoader/actions/workflows/actions.yml/badge.svg)](https://github.com/kaisalmen/WWOBJLoader/actions/workflows/actions.yml)
[![Github Pages](https://img.shields.io/badge/GitHub-Pages-blue?logo=github)](https://kaisalmen.github.io/WWOBJLoader)
[![NPM Version](https://img.shields.io/npm/v/wwobjloader2.svg)](https://www.npmjs.com/package/wwobjloader2)
[![NPM Download](https://img.shields.io/npm/dt/wwobjloader2.svg)](https://www.npmjs.com/package/wwobjloader2)
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kaisalmen/WWOBJLoader)

**OBJLoader2** is a loader for the **OBJ** file format. It is an alternative to [OBJLoader](https://github.com/mrdoob/three.js/blob/dev/examples/jsm/loaders/OBJLoader.js) included in [three.js](https://threejs.org). The loader and its parser can be used on Main via **OBJLoader2** or in parallel inside a web worker via **OBJLoader2Parallel**.

Expand Down Expand Up @@ -47,6 +47,8 @@ If you want to get started see take a look at the following examples. They get m
* OBJLoader2 in react with a .mtl material: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_react-mtl.html)] [[tsx](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/ReactExampleMtl.tsx)]
* AssetPipelineLoader basic example: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/assetpipeline.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/AssetPipelineLoaderExample.ts)]

Try out all examples here: <https://kaisalmen.github.io/WWOBJLoader>

### Main Branch

Main development now takes place on branch [main](https://github.com/kaisalmen/WWOBJLoader/tree/main). Tags identify the releases. The stable branch has been retired.
Expand Down
4 changes: 2 additions & 2 deletions packages/objloader2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"build": "npm run clean && npm run compile && npm run build:lib && npm run build:worker"
},
"volta": {
"node": "20.10.0",
"npm": "10.2.3"
"node": "20.12.2",
"npm": "10.5.0"
},
"dependencies": {
"three": "~0.163.0",
Expand Down

0 comments on commit 36ea130

Please sign in to comment.