diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 4ce041d7d..bbaf538de 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -5,10 +5,6 @@ on: branches: - main -env: - GITEA_MAIL: ${{ secrets.GITEA_MAIL }} - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - jobs: build-deploy: runs-on: ubuntu-latest @@ -16,24 +12,25 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 21 + node-version: 25 ref: main submodules: true fetch-depth: 0 - run: | - yarn install - cp -rf vrma dist/ + cd atmosphere/ + npm i - name: Build env: TZ: "Asia/Tokyo" run: | - yarn build + cd atmosphere/ + npm run build - name: Deploy uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./dist + publish_dir: ./atmosphere/dist user_name: 'ai[bot]' user_email: '138105980+yui-syui-ai[bot]@users.noreply.github.com' diff --git a/README.md b/README.md index 84db76ca5..7929e73df 100644 --- a/README.md +++ b/README.md @@ -47,4 +47,11 @@ $ yarn install $ yarn dev ``` +## theatre + +```sh +$ cd theatre +$ npm install +$ npm run dev +``` diff --git a/dist/vrma b/dist/vrma deleted file mode 160000 index 1eccc36a5..000000000 --- a/dist/vrma +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1eccc36a5113246728ae8b63389c948ce1bd286f diff --git a/package.json b/package.json index 90bccd370..88f358d53 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ "@pixiv/three-vrm-animation": "^3.1.0", "@pixiv/three-vrm-springbone": "^3.1.0", "postprocessing": "^6.35.2", + "react": "^19.2.0", + "react-dom": "^18.3.1", "three": "^0.167.1" } } diff --git a/planet/src/index.css b/planet/src/index.css index 110949926..724b909b7 100644 --- a/planet/src/index.css +++ b/planet/src/index.css @@ -5,6 +5,7 @@ html { body { background-color: #fff; background-color: #000; + background-color: #313131; margin: 0; height: 100%; } diff --git a/planet/src/pages/vrm_model.tsx b/planet/src/pages/vrm_model.tsx index 8e67046b6..740164138 100644 --- a/planet/src/pages/vrm_model.tsx +++ b/planet/src/pages/vrm_model.tsx @@ -88,6 +88,8 @@ export function Galaxy(props: JSX.IntrinsicElements['group']) { const galaxyCenterLightRef = useRef(null!) const searchParams = new URLSearchParams(window.location.search); var g = searchParams.get('g') ?? 'galaxy'; + const ms = searchParams.get('ms'); + const vrm_scale = ms ? parseInt(ms, 10) : 1; var model_galaxy = "./models/galaxy.glb" var model_custom = "./models/ai.vrm" var model_scale = 0.01; @@ -158,7 +160,7 @@ export function Galaxy(props: JSX.IntrinsicElements['group']) { return ( - + {g === 'sun' && } {g === 'galaxy' && } diff --git a/theatre/.gitignore b/theatre/.gitignore new file mode 100644 index 000000000..a547bf36d --- /dev/null +++ b/theatre/.gitignore @@ -0,0 +1,24 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/theatre/README.md b/theatre/README.md new file mode 100644 index 000000000..74872fd4a --- /dev/null +++ b/theatre/README.md @@ -0,0 +1,50 @@ +# React + TypeScript + Vite + +This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules. + +Currently, two official plugins are available: + +- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh +- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh + +## Expanding the ESLint configuration + +If you are developing a production application, we recommend updating the configuration to enable type aware lint rules: + +- Configure the top-level `parserOptions` property like this: + +```js +export default tseslint.config({ + languageOptions: { + // other options... + parserOptions: { + project: ['./tsconfig.node.json', './tsconfig.app.json'], + tsconfigRootDir: import.meta.dirname, + }, + }, +}) +``` + +- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked` +- Optionally add `...tseslint.configs.stylisticTypeChecked` +- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config: + +```js +// eslint.config.js +import react from 'eslint-plugin-react' + +export default tseslint.config({ + // Set the react version + settings: { react: { version: '18.3' } }, + plugins: { + // Add the react plugin + react, + }, + rules: { + // other rules... + // Enable its recommended rules + ...react.configs.recommended.rules, + ...react.configs['jsx-runtime'].rules, + }, +}) +``` diff --git a/theatre/eslint.config.js b/theatre/eslint.config.js new file mode 100644 index 000000000..092408a9f --- /dev/null +++ b/theatre/eslint.config.js @@ -0,0 +1,28 @@ +import js from '@eslint/js' +import globals from 'globals' +import reactHooks from 'eslint-plugin-react-hooks' +import reactRefresh from 'eslint-plugin-react-refresh' +import tseslint from 'typescript-eslint' + +export default tseslint.config( + { ignores: ['dist'] }, + { + extends: [js.configs.recommended, ...tseslint.configs.recommended], + files: ['**/*.{ts,tsx}'], + languageOptions: { + ecmaVersion: 2020, + globals: globals.browser, + }, + plugins: { + 'react-hooks': reactHooks, + 'react-refresh': reactRefresh, + }, + rules: { + ...reactHooks.configs.recommended.rules, + 'react-refresh/only-export-components': [ + 'warn', + { allowConstantExport: true }, + ], + }, + }, +) diff --git a/theatre/index.html b/theatre/index.html new file mode 100644 index 000000000..e4b78eae1 --- /dev/null +++ b/theatre/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite + React + TS + + +
+ + + diff --git a/theatre/package.json b/theatre/package.json new file mode 100644 index 000000000..4848a4a67 --- /dev/null +++ b/theatre/package.json @@ -0,0 +1,32 @@ +{ + "name": "vite-react-typescript-starter", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc -b && vite build", + "lint": "eslint .", + "preview": "vite preview" + }, + "dependencies": { + "@theatre/core": "^0.6.1", + "@theatre/r3f": "^0.7.2", + "@theatre/studio": "^0.6.1", + "react": "^18.3.1", + "react-dom": "^18.3.1" + }, + "devDependencies": { + "@eslint/js": "^9.9.1", + "@types/react": "^18.3.4", + "@types/react-dom": "^18.3.0", + "@vitejs/plugin-react": "^4.3.1", + "eslint": "^9.9.1", + "eslint-plugin-react-hooks": "^5.1.0-rc.0", + "eslint-plugin-react-refresh": "^0.4.11", + "globals": "^15.9.0", + "typescript": "^5.5.3", + "typescript-eslint": "^8.3.0", + "vite": "^5.4.2" + } +} diff --git a/theatre/public/vite.svg b/theatre/public/vite.svg new file mode 100644 index 000000000..e7b8dfb1b --- /dev/null +++ b/theatre/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theatre/src/App.css b/theatre/src/App.css new file mode 100644 index 000000000..b9d355df2 --- /dev/null +++ b/theatre/src/App.css @@ -0,0 +1,42 @@ +#root { + max-width: 1280px; + margin: 0 auto; + padding: 2rem; + text-align: center; +} + +.logo { + height: 6em; + padding: 1.5em; + will-change: filter; + transition: filter 300ms; +} +.logo:hover { + filter: drop-shadow(0 0 2em #646cffaa); +} +.logo.react:hover { + filter: drop-shadow(0 0 2em #61dafbaa); +} + +@keyframes logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +@media (prefers-reduced-motion: no-preference) { + a:nth-of-type(2) .logo { + animation: logo-spin infinite 20s linear; + } +} + +.card { + padding: 2em; +} + +.read-the-docs { + color: #888; +} diff --git a/theatre/src/App.tsx b/theatre/src/App.tsx new file mode 100644 index 000000000..afe48ac75 --- /dev/null +++ b/theatre/src/App.tsx @@ -0,0 +1,35 @@ +import { useState } from 'react' +import reactLogo from './assets/react.svg' +import viteLogo from '/vite.svg' +import './App.css' + +function App() { + const [count, setCount] = useState(0) + + return ( + <> + +

Vite + React

+
+ +

+ Edit src/App.tsx and save to test HMR +

+
+

+ Click on the Vite and React logos to learn more +

+ + ) +} + +export default App diff --git a/theatre/src/assets/react.svg b/theatre/src/assets/react.svg new file mode 100644 index 000000000..6c87de9bb --- /dev/null +++ b/theatre/src/assets/react.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/theatre/src/index.css b/theatre/src/index.css new file mode 100644 index 000000000..6119ad9a8 --- /dev/null +++ b/theatre/src/index.css @@ -0,0 +1,68 @@ +:root { + font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; + line-height: 1.5; + font-weight: 400; + + color-scheme: light dark; + color: rgba(255, 255, 255, 0.87); + background-color: #242424; + + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +a { + font-weight: 500; + color: #646cff; + text-decoration: inherit; +} +a:hover { + color: #535bf2; +} + +body { + margin: 0; + display: flex; + place-items: center; + min-width: 320px; + min-height: 100vh; +} + +h1 { + font-size: 3.2em; + line-height: 1.1; +} + +button { + border-radius: 8px; + border: 1px solid transparent; + padding: 0.6em 1.2em; + font-size: 1em; + font-weight: 500; + font-family: inherit; + background-color: #1a1a1a; + cursor: pointer; + transition: border-color 0.25s; +} +button:hover { + border-color: #646cff; +} +button:focus, +button:focus-visible { + outline: 4px auto -webkit-focus-ring-color; +} + +@media (prefers-color-scheme: light) { + :root { + color: #213547; + background-color: #ffffff; + } + a:hover { + color: #747bff; + } + button { + background-color: #f9f9f9; + } +} diff --git a/theatre/src/main.tsx b/theatre/src/main.tsx new file mode 100644 index 000000000..b4aa27012 --- /dev/null +++ b/theatre/src/main.tsx @@ -0,0 +1,36 @@ +import './index.css' +import { createRoot } from 'react-dom/client' +import React, { useEffect } from 'react' +import { Canvas } from '@react-three/fiber' +import studio from '@theatre/studio' +import extension from '@theatre/r3f/dist/extension' +import { SheetProvider, editable as e, PerspectiveCamera } from '@theatre/r3f' +import { getProject } from '@theatre/core' +import demoProjectState from './state.json' + +studio.initialize() +studio.extend(extension) + +const demoSheet = getProject('Demo Project', { state: demoProjectState }).sheet('Demo Sheet') +//const demoSheet = getProject('Demo Project').sheet('Demo Sheet') +const App = () => { + useEffect(() => { + demoSheet.project.ready.then(() => demoSheet.sequence.play({ iterationCount: Infinity, range: [0, 1] })) + }, []) + + return ( + + + + + + + + + + + + ) +} + +createRoot(document.getElementById('root')!).render() diff --git a/theatre/src/state.json b/theatre/src/state.json new file mode 100644 index 000000000..468cea8d8 --- /dev/null +++ b/theatre/src/state.json @@ -0,0 +1,7 @@ +{ + "sheetsById": {}, + "definitionVersion": "0.4.0", + "revisionHistory": [ + "jbMA2kSJZuOGYgr9" + ] +} \ No newline at end of file diff --git a/theatre/src/vite-env.d.ts b/theatre/src/vite-env.d.ts new file mode 100644 index 000000000..11f02fe2a --- /dev/null +++ b/theatre/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/theatre/tsconfig.app.json b/theatre/tsconfig.app.json new file mode 100644 index 000000000..f0a235055 --- /dev/null +++ b/theatre/tsconfig.app.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "target": "ES2020", + "useDefineForClassFields": true, + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "isolatedModules": true, + "moduleDetection": "force", + "noEmit": true, + "jsx": "react-jsx", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src"] +} diff --git a/theatre/tsconfig.json b/theatre/tsconfig.json new file mode 100644 index 000000000..1ffef600d --- /dev/null +++ b/theatre/tsconfig.json @@ -0,0 +1,7 @@ +{ + "files": [], + "references": [ + { "path": "./tsconfig.app.json" }, + { "path": "./tsconfig.node.json" } + ] +} diff --git a/theatre/tsconfig.node.json b/theatre/tsconfig.node.json new file mode 100644 index 000000000..0d3d71446 --- /dev/null +++ b/theatre/tsconfig.node.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "target": "ES2022", + "lib": ["ES2023"], + "module": "ESNext", + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "isolatedModules": true, + "moduleDetection": "force", + "noEmit": true, + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["vite.config.ts"] +} diff --git a/theatre/vite.config.ts b/theatre/vite.config.ts new file mode 100644 index 000000000..5a33944a9 --- /dev/null +++ b/theatre/vite.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], +})