Skip to content

Commit

Permalink
upgrade to threejs 0.173 (#4809)
Browse files Browse the repository at this point in the history
* upgrade to threejs 0.173

* add changelog
  • Loading branch information
SimonDanisch authored Feb 20, 2025
1 parent 65495fa commit 60d3fef
Show file tree
Hide file tree
Showing 9 changed files with 18,660 additions and 21,036 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

- Updated WGLMakie's threejs version from 0.157 to 0.173, fixing some threejs bugs [#4809](https://github.com/MakieOrg/Makie.jl/pull/4809).
- Moved Axis3 clip planes slightly outside to avoid clipping objects on the border with 0 margin [#4742](https://github.com/MakieOrg/Makie.jl/pull/4742)
- Fixed an issue with transformations not propagating to child plots when their spaces only match indirectly. [#4723](https://github.com/MakieOrg/Makie.jl/pull/4723)
- Added a tutorial on creating an inset plot [#4697](https://github.com/MakieOrg/Makie.jl/pull/4697)
Expand Down
2 changes: 1 addition & 1 deletion WGLMakie/src/Camera.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as THREE from "./THREE.js";
import * as THREE from "https://cdn.esm.sh/v66/[email protected]/es2021/three.js";
import { OrbitControls } from "./OrbitControls.js";

// Unitless is the scene pixel unit space
Expand Down
1 change: 0 additions & 1 deletion WGLMakie/src/Lines.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
} from "./Shaders.js";

import { deserialize_uniforms } from "./Serialization.js";
import { IntType } from "./THREE.js";

function filter_by_key(dict, keys, default_value = false) {
const result = {};
Expand Down
2 changes: 1 addition & 1 deletion WGLMakie/src/OrbitControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
Plane,
Ray,
MathUtils,
} from "./THREE.js";
} from "https://cdn.esm.sh/v66/[email protected]/es2021/three.js";

// OrbitControls performs orbiting, dollying (zooming), and panning.
// Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default).
Expand Down
2 changes: 1 addition & 1 deletion WGLMakie/src/Serialization.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as THREE from "./THREE.js";
import * as THREE from "https://cdn.esm.sh/v66/[email protected]/es2021/three.js";
import * as Camera from "./Camera.js";
import { create_line, create_linesegments } from "./Lines.js";

Expand Down
3,588 changes: 0 additions & 3,588 deletions WGLMakie/src/THREE.js

This file was deleted.

2 changes: 1 addition & 1 deletion WGLMakie/src/WGLMakie.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using Makie: apply_transform_and_f32_conversion, f32_conversion_obs, f32_convert
struct WebGL <: ShaderAbstractions.AbstractContext end

const WGL = ES6Module(@path joinpath(@__DIR__, "wglmakie.js"))
# Main.download("https://cdn.esm.sh/v66/three@0.157/es2021/three.js", joinpath(@__DIR__, "THREE.js"))
# using as THREE version: "https://cdn.esm.sh/v66/three@0.173/es2021/three.js"

include("display.jl")
include("three_plot.jl")
Expand Down
Loading

0 comments on commit 60d3fef

Please sign in to comment.