Skip to content

fix: replace deprecated Clock with Timer #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madisonrickert wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −7
Open

fix: replace deprecated Clock with Timer #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/objects/Water2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
Clock,
Timer,
Color,
Matrix4,
Mesh,
Expand Down Expand Up @@ -190,7 +190,7 @@ const Water2 = /* @__PURE__ */ (() => {
const cycle = 0.15 // a cycle of a flow map phase
const halfCycle = cycle * 0.5
const textureMatrix = new Matrix4()
const clock = new Clock()
const timer = new Timer()

// internal components

Expand Down Expand Up @@ -278,7 +278,7 @@ const Water2 = /* @__PURE__ */ (() => {
}

function updateFlow() {
const delta = clock.getDelta()
const delta = timer.getDelta()
const config = scope.material.uniforms['config']

config.value.x += flowSpeed * delta // flowMapOffset0
Expand All @@ -299,6 +299,7 @@ const Water2 = /* @__PURE__ */ (() => {
//

this.onBeforeRender = function (renderer, scene, camera) {
timer.update()
updateTextureMatrix(camera)
updateFlow()

Expand Down
10 changes: 6 additions & 4 deletions src/postprocessing/EffectComposer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Clock, LinearFilter, RGBAFormat, NoBlending, Vector2, WebGLRenderer, WebGLRenderTarget } from 'three'
import { Timer, LinearFilter, RGBAFormat, NoBlending, Vector2, WebGLRenderer, WebGLRenderTarget } from 'three'
import { CopyShader } from '../shaders/CopyShader'
import { ShaderPass } from './ShaderPass'
import { MaskPass, ClearMaskPass } from './MaskPass'
Expand All @@ -16,7 +16,7 @@ class EffectComposer<TRenderTarget extends WebGLRenderTarget = WebGLRenderTarget
public renderToScreen: boolean
public passes: Pass[] = []
public copyPass: Pass
public clock: Clock
public timer: Timer

constructor(renderer: WebGLRenderer, renderTarget?: TRenderTarget) {
this.renderer = renderer
Expand Down Expand Up @@ -68,7 +68,7 @@ class EffectComposer<TRenderTarget extends WebGLRenderTarget = WebGLRenderTarget
// @ts-ignore
this.copyPass.material.blending = NoBlending

this.clock = new Clock()
this.timer = new Timer()
}

public swapBuffers(): void {
Expand Down Expand Up @@ -108,8 +108,10 @@ class EffectComposer<TRenderTarget extends WebGLRenderTarget = WebGLRenderTarget
public render(deltaTime?: number): void {
// deltaTime value is in seconds

this.timer.update()

if (deltaTime === undefined) {
deltaTime = this.clock.getDelta()
deltaTime = this.timer.getDelta()
}

const currentRenderTarget = this.renderer.getRenderTarget()
Expand Down
Loading