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

Jump to bottom

feat(app): 680 UseTexture composable as component #757

Merged
merged 10 commits into from
Sep 6, 2024
Merged

feat(app): 680 UseTexture composable as component #757

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5b110b
feat(app): 680 UseTexture composable as component
JaimeTorrealba Jul 3, 2024
3983bd3
Merge branch 'main' into feature/680-usetexture-component
JaimeTorrealba Sep 2, 2024
784bb46
refactor: change structure, keep standard of tres
JaimeTorrealba Sep 2, 2024
962ec37
fix: linter
JaimeTorrealba Sep 2, 2024
1e17413
docs: add docs
JaimeTorrealba Sep 3, 2024
5b5998f
Merge remote-tracking branch 'origin/main' into feature/680-usetextur…
JaimeTorrealba Sep 5, 2024
57ffcc4
docs: add props to the docs
JaimeTorrealba Sep 5, 2024
fd5caff
fix: lint
JaimeTorrealba Sep 5, 2024
5818bbd
fix: update pnpm-lock
JaimeTorrealba Sep 6, 2024
3eb919e
Merge remote-tracking branch 'origin/main' into feature/680-usetextur…
JaimeTorrealba Sep 6, 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
fix: linter
  • Loading branch information
@JaimeTorrealba
JaimeTorrealba committed Sep 2, 2024
commit 962ec37c613dfcc3243464a11df414777b86a66f
2 changes: 1 addition & 1 deletion playground/src/pages/basic/Textures.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup>
import { TresCanvas, UseTexture } from '@tresjs/core'
import { OrbitControls } from '@tresjs/cientos'
import { TresCanvas, UseTexture } from '@tresjs/core'

const path = 'https://raw.githubusercontent.com/Tresjs/assets/main/textures/black-rock/Rock035_2K_Displacement.jpg'
</script>
Expand Down
33 changes: 17 additions & 16 deletions playground/vue/src/pages/basic/Textures.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<script setup>
import { TresCanvas, UseTexture, vLog } from '@tresjs/core'
import { TresCanvas, UseTexture } from '@tresjs/core'
import { OrbitControls } from '@tresjs/cientos'

const path = 'https://raw.githubusercontent.com/Tresjs/assets/main/textures/black-rock/Rock035_2K_Displacement.jpg'
</script>

<template>
<TresCanvas window-size clear-color="#111">
<TresPerspectiveCamera :position="[0, 0, 3]" :fov="45" :aspect="1" :near="0.1" :far="1000" />
<OrbitControls />
<Suspense>
<UseTexture v-slot="{ textures }" :map="path">
<TresMesh>
<TresBoxGeometry />
<TresMeshStandardMaterial :map="textures.map" v-log />
</TresMesh>
</UseTexture>
</Suspense>
<TresDirectionalLight :position="[4, 4, 4]" />
<TresAmbientLight :intensity="0.5" />
</TresCanvas>
</template>
<TresCanvas window-size clear-color="#111">
<TresPerspectiveCamera :position="[0, 0, 3]" :fov="45" :aspect="1" :near="0.1" :far="1000" />
<OrbitControls />
<Suspense>
<UseTexture v-slot="{ textures }" :map="path">
<TresMesh>
<TresBoxGeometry />
<TresMeshStandardMaterial :map="textures.map" />
</TresMesh>
</UseTexture>
</Suspense>
<TresDirectionalLight :position="[4, 4, 4]" />
<TresAmbientLight :intensity="0.5" />
</TresCanvas>
</template>
1 change: 1 addition & 0 deletions src/composables/useTexture/component.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const props = defineProps<PBRUseTextureMap>()

const data = await reactive(useTexture(props))
</script>

<template>
<slot :textures="data"></slot>
</template>
6 changes: 3 additions & 3 deletions src/core/nodeOps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,9 +1626,9 @@ function createSimpleMeshPrimitiveTree(nodeOps) {
const nodes = []
const objects = []
const spiesByKey: Partial<Record<
keyof typeof nodesByKey,
{ material: () => void, geometry: () => void }
>> = { }
keyof typeof nodesByKey,
{ material: () => void, geometry: () => void }
>> = { }
const spies = []
const undisposed = new Set()
for (const [key, node] of Object.entries(nodesByKey)) {
Expand Down
Loading