Skip to content

Commit

Permalink
Merge branch 'main' into add-post-processing-to-docs-sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarosabu authored Sep 18, 2024
2 parents f33261d + 18e4642 commit 5e5ad74
Show file tree
Hide file tree
Showing 43 changed files with 2,399 additions and 1,782 deletions.
8 changes: 0 additions & 8 deletions .husky/install.mjs

This file was deleted.

25 changes: 0 additions & 25 deletions .husky/pre-push

This file was deleted.

4 changes: 2 additions & 2 deletions docs/.vitepress/theme/components/LocalOrbitControls.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script lang="ts" setup>
import type { TresVector3 } from '@tresjs/core'
import type { Camera } from 'three'
import { extend, useRenderLoop, useTresContext } from '@tresjs/core'
import { useEventListener } from '@vueuse/core'
import { OrbitControls } from 'three-stdlib'
import { onMounted, onUnmounted, shallowRef, unref } from 'vue'
import type { TresVector3 } from '@tresjs/core'
import type { Camera } from 'three'
export interface OrbitControlsProps {
/**
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/theme/components/StackBlitzEmbed.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { EmbedOptions } from '@stackblitz/sdk'
import sdk from '@stackblitz/sdk'
import { ref, watch } from 'vue'
import type { EmbedOptions } from '@stackblitz/sdk'
const props = withDefaults(
defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import VPTheme from 'vitepress/theme'
import type { Theme } from 'vitepress'
import VPTheme from 'vitepress/theme'

import TresLayout from './TresLayout.vue'
import './custom.css'
Expand Down
37 changes: 18 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,36 +63,35 @@
"docs:build": "vitepress build docs",
"docs:serve": "vitepress serve docs",
"docs:preview": "vitepress preview docs",
"docs:contributors": "esno scripts/update-contributors.ts",
"prepare": "node .husky/install.mjs"
"docs:contributors": "esno scripts/update-contributors.ts"
},
"peerDependencies": {
"three": ">=0.133",
"vue": ">=3.4"
},
"dependencies": {
"@alvarosabu/utils": "^3.2.0",
"@vue/devtools-api": "^6.6.3",
"@vueuse/core": "^11.0.3"
"@vue/devtools-api": "^7.4.5",
"@vueuse/core": "^11.1.0"
},
"devDependencies": {
"@release-it/conventional-changelog": "^8.0.1",
"@release-it/conventional-changelog": "^8.0.2",
"@stackblitz/sdk": "^1.11.0",
"@tresjs/cientos": "4.0.2",
"@tresjs/eslint-config": "^1.2.0",
"@tresjs/eslint-config": "^1.3.1",
"@types/three": "^0.168.0",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vitest/coverage-c8": "^0.33.0",
"@vitest/coverage-v8": "^2.0.2",
"@vitest/ui": "^2.0.2",
"@vitest/coverage-v8": "^2.1.1",
"@vitest/ui": "^2.1.1",
"@vue/test-utils": "^2.4.6",
"eslint": "^9.9.1",
"eslint": "^9.10.0",
"eslint-plugin-vue": "^9.28.0",
"esno": "^4.7.0",
"gsap": "^3.12.5",
"husky": "^9.1.5",
"husky": "^9.1.6",
"jsdom": "^25.0.0",
"kolorist": "^1.8.0",
"ohmyfetch": "^0.4.21",
Expand All @@ -101,20 +100,20 @@
"rollup-plugin-analyzer": "^4.0.0",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-visualizer": "^5.12.0",
"sponsorkit": "^0.15.4",
"sponsorkit": "^0.15.5",
"three": "^0.168.0",
"unocss": "^0.62.3",
"unplugin": "^1.13.1",
"unocss": "^0.62.4",
"unplugin": "^1.14.1",
"unplugin-vue-components": "^0.27.4",
"vite": "^5.4.3",
"vite": "^5.4.6",
"vite-plugin-banner": "^0.8.0",
"vite-plugin-dts": "4.1.0",
"vite-plugin-dts": "4.2.1",
"vite-plugin-inspect": "^0.8.7",
"vite-plugin-require-transform": "^1.0.21",
"vite-svg-loader": "^5.1.0",
"vitepress": "1.3.4",
"vitest": "^2.0.2",
"vue": "3.5.3",
"vitest": "^2.1.1",
"vue": "3.5.6",
"vue-demi": "^0.14.10"
}
}
2 changes: 1 addition & 1 deletion playground/nuxt/components/EnvironmentLocal.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script setup lang="ts">
import type { LoaderProto } from '@tresjs/core'
import { useLoader, useTresContext } from '@tresjs/core'
import { CubeReflectionMapping, type CubeTexture, CubeTextureLoader, EquirectangularReflectionMapping, type Texture } from 'three'
import { RGBELoader } from 'three-stdlib'
import type { LoaderProto } from '@tresjs/core'
/* const files = ref(['/px.jpg', '/nx.jpg', '/py.jpg', '/ny.jpg', '/pz.jpg', '/nz.jpg']) */
const files = ref('venice/venice_sunset_1k.hdr')
Expand Down
2 changes: 1 addition & 1 deletion playground/vue/src/composables/useFBX.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Object3D } from 'three'
import { useLoader } from '@tresjs/core'
import { FBXLoader } from 'three-stdlib'
import type { Object3D } from 'three'

/**
* Loads an FBX file and returns a THREE.Object3D.
Expand Down
4 changes: 2 additions & 2 deletions playground/vue/src/composables/useGLTF.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type TresLoader, type TresObject3D, useLoader } from '@tresjs/core'
import { DRACOLoader, GLTFLoader } from 'three-stdlib'
import type { AnimationClip, Material, Scene } from 'three'
import type { GLTF } from 'three-stdlib'
import { type TresLoader, type TresObject3D, useLoader } from '@tresjs/core'
import { DRACOLoader, GLTFLoader } from 'three-stdlib'

export interface GLTFLoaderOptions {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { WebGLRenderer } from 'three'
import { TresCanvas } from '@tresjs/core'
import { shallowRef } from 'vue'
import type { WebGLRenderer } from 'three'
const rendererRef = shallowRef<WebGLRenderer | null>(null)
const minDpr = 1
Expand Down
4 changes: 2 additions & 2 deletions playground/vue/src/pages/advanced/fbo/useFBO.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { Camera, WebGLRenderTargetOptions } from 'three'
import type { Ref } from 'vue'
/* eslint-disable no-console */
import { useLoop, useTresContext } from '@tresjs/core'
import { useThrottleFn } from '@vueuse/core'
import { DepthTexture, FloatType, HalfFloatType, LinearFilter, WebGLRenderTarget } from 'three'
import { isReactive, onBeforeUnmount, reactive, ref, toRefs, watchEffect } from 'vue'
import type { Camera, WebGLRenderTargetOptions } from 'three'
import type { Ref } from 'vue'

export interface FboOptions {
/*
Expand Down
4 changes: 2 additions & 2 deletions playground/vue/src/pages/basic/Lights.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import type { TresObject } from '@tresjs/core'
import { OrbitControls } from '@tresjs/cientos'
import { TresCanvas, vDistanceTo, vLightHelper, vLog } from '@tresjs/core'
import { BasicShadowMap, NoToneMapping, SRGBColorSpace } from 'three'
import type { TresObject } from '@tresjs/core'
import { BasicShadowMap, NoToneMapping, SRGBColorSpace } from 'three'
const gl = {
clearColor: '#82DBC5',
Expand Down
4 changes: 2 additions & 2 deletions playground/vue/src/pages/basic/ready/index.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script setup lang="ts">
import { TresCanvas } from '@tresjs/core'
import { ref } from 'vue'
import type { TresContext } from '@tresjs/core'
import type { ShallowRef } from 'vue'
import { TresCanvas } from '@tresjs/core'
import { ref } from 'vue'
import LoopCallbackWatcher from './LoopCallbackWatcher.vue'
import OnTresReadyWatcher from './OnTresReadyWatcher.vue'
Expand Down
2 changes: 1 addition & 1 deletion playground/vue/src/pages/cameras/multipleCameras/index.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script setup lang="ts">
import type { Camera } from 'three'
import { OrbitControls } from '@tresjs/cientos'
import { TresCanvas } from '@tresjs/core'
import { TresLeches, useControls } from '@tresjs/leches'
import type { Camera } from 'three'
import TheCameraOperator from './TheCameraOperator.vue'
import '@tresjs/leches/styles'
Expand Down
2 changes: 1 addition & 1 deletion playground/vue/src/pages/events/index.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!-- eslint-disable no-console -->
<script setup lang="ts">
import type { ThreeEvent } from '@tresjs/core'
import { OrbitControls, StatsGl } from '@tresjs/cientos'
import { TresCanvas } from '@tresjs/core'
import { TresLeches, useControls } from '@tresjs/leches'
import { BasicShadowMap, NoToneMapping, SRGBColorSpace } from 'three'
import type { ThreeEvent } from '@tresjs/core'
import '@tresjs/leches/styles'
const gl = {
Expand Down
2 changes: 1 addition & 1 deletion playground/vue/src/pages/issues/701/TheExperience.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!-- eslint-disable no-console -->
<script setup lang="ts">
import type { BufferGeometry, Camera, Material } from 'three'
import { useLoop } from '@tresjs/core'
import {
BoxGeometry,
Expand All @@ -12,7 +13,6 @@ import {
TorusGeometry,
} from 'three'
import { onUnmounted, shallowRef } from 'vue'
import type { BufferGeometry, Camera, Material } from 'three'
const box = (() => {
const box = new Mesh(
Expand Down
Loading

0 comments on commit 5e5ad74

Please sign in to comment.