fix: akwardly added fog and fixed also typing

Tresjs · May 8, 2023 · e256768 · e256768
1 parent e744672
commit e256768
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/playground/src/components/TheExperience.vue b/playground/src/components/TheExperience.vue
@@ -31,6 +31,7 @@ watchEffect(() => {
   <TresCanvas v-bind="gl" ref="context">
     <TresPerspectiveCamera :position="[7, 7, 7]" :look-at="[0, 4, 0]" />
     <OrbitControls />
+    <TresFog :color="gl.clearColor" :near="5" :far="15" />
     <TresMesh :position="[-2, 6, 0]" :rotation="[0, Math.PI, 0]" cast-shadow>
       <TresConeGeometry :args="[1, 1.5, 3]" />
       <TresMeshToonMaterial color="#82DBC5" />

diff --git a/plugins/vite-tres-types-plugin.ts b/plugins/vite-tres-types-plugin.ts
@@ -29,7 +29,8 @@ export const unplugin = createUnplugin(() => {
               key.endsWith('Material') ||
               key.endsWith('Helper') ||
               key.endsWith('Light') ||
-              key.endsWith('Camera'),
+              key.endsWith('Camera') ||
+              key.endsWith('Fog'),
           )
           .join(',\n')}
       } from 'three';
@@ -92,7 +93,8 @@ export const unplugin = createUnplugin(() => {
               key.endsWith('Material') ||
               key.endsWith('Helper') ||
               key.endsWith('Light') ||
-              key.endsWith('Camera'),
+              key.endsWith('Camera') ||
+              key.endsWith('Fog'),
           )
           .map(key => `Tres${key}: DefineComponent<Partial<Omit<${key}, OverwrittenProps > & TresModifiedObject>>`)
           .join('\n')}

diff --git a/src/core/nodeOps.ts b/src/core/nodeOps.ts
@@ -93,6 +93,8 @@ export const nodeOps: RendererOptions<TresObject, TresObject> = {
     if (child?.isObject3D && parent?.isObject3D) {
       parent.add(child)
       child.dispatchEvent({ type: 'added' })
+    } else if (child?.isFog) {
+      parent.fog = child
     } else if (typeof child?.attach === 'string') {
       child.__previousAttach = child[parent?.attach]
       if (parent) {

diff --git a/src/types/tres-components.d.ts b/src/types/tres-components.d.ts
@@ -32,6 +32,7 @@ DodecahedronGeometry,
 EdgesGeometry,
 ExtrudeBufferGeometry,
 ExtrudeGeometry,
+Fog,
 GridHelper,
 HemisphereLight,
 HemisphereLightHelper,
@@ -206,6 +207,7 @@ TresDodecahedronGeometry: DefineComponent<Partial<Omit<DodecahedronGeometry, Ove
 TresEdgesGeometry: DefineComponent<Partial<Omit<EdgesGeometry, OverwrittenProps > & TresModifiedObject>>
 TresExtrudeBufferGeometry: DefineComponent<Partial<Omit<ExtrudeBufferGeometry, OverwrittenProps > & TresModifiedObject>>
 TresExtrudeGeometry: DefineComponent<Partial<Omit<ExtrudeGeometry, OverwrittenProps > & TresModifiedObject>>
+TresFog: DefineComponent<Partial<Omit<Fog, OverwrittenProps > & TresModifiedObject>>
 TresGridHelper: DefineComponent<Partial<Omit<GridHelper, OverwrittenProps > & TresModifiedObject>>
 TresHemisphereLight: DefineComponent<Partial<Omit<HemisphereLight, OverwrittenProps > & TresModifiedObject>>
 TresHemisphereLightHelper: DefineComponent<Partial<Omit<HemisphereLightHelper, OverwrittenProps > & TresModifiedObject>>