Skip to content
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

feat: 524 feat add directives to core #525

Merged
merged 5 commits into from
Jan 29, 2024
Merged

feat: 524 feat add directives to core #525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df28b8c
feat: add directives to core, add color support to light helper
alvarosabu Jan 27, 2024
a383bdd
feat: v-distance-to types and minor improvements
alvarosabu Jan 27, 2024
09ce01c
types: v-log
alvarosabu Jan 27, 2024
e937625
docs: add directives
alvarosabu Jan 27, 2024
dc4e4c1
docs: fix build issues
alvarosabu Jan 27, 2024
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
Prev Previous commit
Next Next commit
feat: v-distance-to types and minor improvements
  • Loading branch information
@alvarosabu
alvarosabu committed Jan 27, 2024
commit a383bddc025d73d7e929d6931f08b5dfaa7c3df7
24 changes: 15 additions & 9 deletions playground/src/pages/lights.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { TresCanvas, vLightHelper } from '@tresjs/core'
import type { TresObject } from '@tresjs/core'
import { TresCanvas, vLightHelper, vAlwaysLookAt, vDistanceTo } from '@tresjs/core'
import { BasicShadowMap, SRGBColorSpace, NoToneMapping } from 'three'

import { OrbitControls } from '@tresjs/cientos'
Expand All @@ -12,34 +13,39 @@ const gl = {
outputColorSpace: SRGBColorSpace,
toneMapping: NoToneMapping,
}

const planeRef: Ref<TresObject | null> = ref(null)
</script>

<template>
<TresCanvas v-bind="gl">
<TresPerspectiveCamera :position="[3, 3, 3]" />
<OrbitControls />

<TresMesh
:position="[0, 4, 0]"
cast-shadow
>
<TresSphereGeometry :args="[1, 32, 32]" />
<TresMeshToonMaterial color="yellow" />
</TresMesh>

<TresDirectionalLight
v-light-helper
v-always-look-at="[8, 16, 0]"
:position="[0, 8, 4]"
:intensity="0.7"
color="yellow"
cast-shadow
/>
<TresMesh
ref="planeRef"
:rotation="[-Math.PI / 2, 0, 0]"
receive-shadow
>
<TresPlaneGeometry :args="[10, 10, 10, 10]" />
<TresMeshToonMaterial />
</TresMesh>
<TresMesh
v-distance-to="planeRef"
:position="[2, 4, 0]"
cast-shadow
>
<TresSphereGeometry :args="[1, 32, 32]" />
<TresMeshToonMaterial color="yellow" />
</TresMesh>
<TresAmbientLight :intensity="1" />
</TresCanvas>
</template>
4 changes: 3 additions & 1 deletion src/directives/vAlwaysLookAt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { useRenderLoop, useLogger } from '@tresjs/core'
import type { Object3D } from 'three'
import type { Ref } from 'vue'
import { extractBindingPosition } from '../utils'
import type { TresVector3 } from '../types'

const { logWarning } = useLogger()

export const vAlwaysLookAt = {
updated: (el: Object3D, binding: any) => {
updated: (el: Object3D, binding: Ref<TresVector3>) => {
const observer = extractBindingPosition(binding)
if (!observer) {
logWarning(`v-always-look-at: problem with binding value: ${binding.value}`)
Expand Down
8 changes: 5 additions & 3 deletions src/directives/vDistanceTo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { useLogger } from '@tresjs/core'
import { ArrowHelper } from 'three'
import type { Ref } from 'vue'
import { extractBindingPosition } from '../utils'
import type { TresObject } from '../types'

const { logWarning } = useLogger()

export const vDistanceTo = {
updated: (el: any, binding: any) => {
updated: (el: TresObject, binding: Ref<TresObject>) => {
const observer = extractBindingPosition(binding)
if (!observer) {
logWarning(`v-distance-to: problem with binding value: ${binding.value}`)
Expand All @@ -17,7 +19,7 @@ export const vDistanceTo = {
}
const dir = observer.clone().sub(el.position)
dir.normalize()
arrowHelper = new ArrowHelper( dir, el.position, el.position.distanceTo(observer) / 1.5, 0xffff00 )
arrowHelper = new ArrowHelper( dir, el.position, el.position.distanceTo(observer), 0xffff00 )
el.parent.add( arrowHelper )
// eslint-disable-next-line no-console
console.table([
Expand All @@ -27,7 +29,7 @@ export const vDistanceTo = {
],
)
},
unmounted: (el: any) => {
unmounted: (el: TresObject) => {
arrowHelper?.dispose()
el.parent.remove(arrowHelper)
},
Expand Down
4 changes: 2 additions & 2 deletions src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ export const isArray = Array.isArray as (a: any) => a is any[] | readonly any[]

export function extractBindingPosition(binding: any): Vector3 {
let observer = binding.value
if (binding.value && binding.value?.value?.isMesh) {
observer = binding.value.value.position
if (binding.value && binding.value?.isMesh) {
observer = binding.value.position
}
if (Array.isArray(binding.value)) observer = new Vector3(...observer)
return observer
Expand Down
Loading