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.

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

fix: vue attrs hyphenation issues #424

Merged
merged 2 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export default tresLintConfig({
}, {
rules: {
'style/max-statements-per-line': 'off',
'vue/attribute-hyphenation': 'off',
'jsdoc/check-alignment': 'off',
},
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"devDependencies": {
"@release-it/conventional-changelog": "^8.0.1",
"@tresjs/core": "^3.2.1",
"@tresjs/eslint-config": "^1.0.0",
"@tresjs/eslint-config": "^1.1.0",
"@tweakpane/core": "^1.1.9",
"@types/node": "^20.12.10",
"@types/three": "^0.164.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AkuAku: typeof import('./src/components/AkuAku.vue')['default']
Expand Down
2 changes: 1 addition & 1 deletion playground/src/pages/staging/SkyDemo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const gl = {
toneMappingExposure: 1,
}

const [turbidity, rayleigh, mieCoefficient, mieDirectionalG, elevation, azimuth, distance, exposure] = useControls({
const { turbidity, rayleigh, mieCoefficient, mieDirectionalG, elevation, azimuth, distance, exposure } = useControls({
turbidity: { value: 3.4, min: 0, max: 20, step: 0.1 },
rayleigh: { value: 3, min: 0, max: 4, step: 0.1 },
mieCoefficient: { value: 0.005, min: 0, max: 0.1, step: 0.001 },
Expand Down
416 changes: 210 additions & 206 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/core/materials/holographicMaterial/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ onLoop(() => {
<template>
<TresHolographicMaterial
ref="MeshHolographicMaterialClass"
:uniforms-fresnel-amount-value="props.fresnelAmount"
:uniforms-enable-blinking-value="props.enableBlinking"
:uniforms-fresnel-opacity-value="props.fresnelOpacity"
:uniforms-hologram-brightness-value="props.hologramBrightness"
:uniforms-scanline-size-value="props.scanlineSize"
:uniforms-signal-speed-value="props.signalSpeed"
:uniforms-hologram-color-value="props.hologramColor"
:uniforms-hologram-opacity-value="props.hologramOpacity"
:uniforms-blink-fresnel-only-value="props.blinkFresnelOnly"
:enable-additive="props.enableAdditive"
:uniforms-fresnelAmount-value="props.fresnelAmount"
:uniforms-enableBlinking-value="props.enableBlinking"
:uniforms-fresnelOpacity-value="props.fresnelOpacity"
:uniforms-hologramBrightness-value="props.hologramBrightness"
:uniforms-scanlineSize-value="props.scanlineSize"
:uniforms-signalSpeed-value="props.signalSpeed"
:uniforms-hologramColor-value="props.hologramColor"
:uniforms-hologramOpacity-value="props.hologramOpacity"
:uniforms-blinkFresnelOnly-value="props.blinkFresnelOnly"
:enableAdditive="props.enableAdditive"
:side="props.side"
/>
</template>
6 changes: 3 additions & 3 deletions src/core/staging/Sky.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ defineExpose({
:object="skyImpl"
:material-uniforms-turbidity-value="props.turbidity"
:material-uniforms-rayleigh-value="props.rayleigh"
:material-uniforms-mie-coefficient-value="props.mieCoefficient"
:material-uniforms-mie-directional-g-value="props.mieDirectionalG"
:material-uniforms-sun-position-value="sunPosition"
:material-uniforms-mieCoefficient-value="props.mieCoefficient"
:material-uniforms-mieDirectionalG-value="props.mieDirectionalG"
:material-uniforms-sunPosition-value="sunPosition"
:scale="props.distance"
/>
</template>
Loading