Merge branch 'release/0.4'

Author: EepyBerry

LICENSE

@@ -1,28 +1,50 @@
-BSD 3-Clause License
+"I'm So Tired" Software License 1.0 (No-Resale ver.)
 
 Copyright (c) 2024, EepyBerry
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This is anti-capitalist, anti-bigotry software, made by people who are tired of
+ill-intended organisations and individuals, and would rather not have those
+around their creations.
+
+Permission is granted, free of charge, to any user (be they a person or an
+organisation) obtaining a copy of this software, to use it for personal,
+commercial, or educational purposes, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in
+   all copies or modified versions of this software.
+
+2. The user is one of the following:
+    a. an individual person, labouring for themselves
+    b. a non-profit organisation
+    c. an educational institution
+    d. an organization that seeks shared profit for all of its members, and
+       allows non-members to set the cost of their labor
+
+3. If the user is an organization with owners, then all owners are workers and
+   all workers are owners with equal equity and/or equal vote.
+
+4. If the user is an organization, then the user is not law enforcement or
+   military, or working for or under either.
+
+5. The user does not use the software for ill-intentioned reasons, as
+   determined by the authors of the software. said reasons include but are not
+   limited to:
+    a. bigotry, including but not limited to racism, xenophobia, homophobia,
+       transphobia, ableism, sexism, antisemitism, religious intolerance
+    b. pedophilia, zoophilia, and/or incest
+    c. support for law enforcement and/or the military
+    d. any blockchain-related technology, including but not limited to
+       cryptocurrencies and non-fungible tokens
+
+6. The user does not promote or engage with any of the activities listed in the
+   previous item, and is not affiliated with any group that promotes or engages
+   with any of such activities.
+
+7. The user does not resell the software or any parts of it.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY
+KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,15 +1,13 @@
-
 <div align="center">
-  <img alt="update-logo" src="https://github.com/user-attachments/assets/948848d9-f173-4e61-a6c2-6a9f98af11c5">
+  <img alt="update-logo" src="https://github.com/user-attachments/assets/d2a172d2-3b3f-45dc-9e38-4315536aa57e">
 </div>
 
-
 # Lagrange - Procedural Planet Builder 🪐
 
 <p>
-  <img src="https://img.shields.io/badge/VueJS-3.4-%2342B883?logo=vuedotjs&labelColor=%2335495E&logoColor=white">
-  <img src="https://img.shields.io/badge/Vite-5.2-%23BD34FE?logo=vite&labelColor=%2335495E&logoColor=white">
-  <img src="https://img.shields.io/badge/ThreeJS-r166-%23049EF4?logo=threedotjs&labelColor=%2335495E&logoColor=white">
+  <img src="https://img.shields.io/badge/VueJS-3.5-%2342B883?logo=vuedotjs&labelColor=%2335495E&logoColor=white">
+  <img src="https://img.shields.io/badge/Vite-5.4-%23BD34FE?logo=vite&labelColor=%2335495E&logoColor=white">
+  <img src="https://img.shields.io/badge/ThreeJS-r169-%23049EF4?logo=threedotjs&labelColor=%2335495E&logoColor=white">
 </p>
 
 A WebGL project using VueJS and ThreeJS! <br>
@@ -19,24 +17,25 @@ Lagrange is a browser application to help you create your own planets, using pro
 
 _(**note:** this is something I am working on during my free time, which means that update frequency will vary!)_
 
-## 🚀 Latest version: "Ecosystems"!
+## 🚀 Latest version: "Jovian Expansion"!
 
 <ul>
-  <li>⭐ Introduces a fully fledged <strong>biome system</strong>, using temperature- & humidity-based positioning!</li>
-  <li>⭐ Surface noise now works properly in Linux-based browsers!</li>
-  <li>⭐ Smaller performance fixes all around, including fewer GLSL uniforms & varyings!</li>
+  <li>⭐ Adds <strong>new parameters</strong> for your worlds: XYZ warping, displacement and ring systems!</li>
+  <li>⭐ New dialog box when trying to leave the Editor without saving first, along with many touch-ups & improvements!</li>
+  <li>⭐ Adds fr-FR translation, and changes project license to ISTSL-NR 1.0!</li>
 </ul>
 
 ## 🖼️ Showcase
 
 <div align="center">
   <img width="30%" src="https://github.com/user-attachments/assets/937ec6c2-6969-49fa-a32c-856a759524f0" title="Kormeg" alt="planet:Kormeg">
-  <img width="30%" src="https://github.com/user-attachments/assets/73345f0a-43d9-4055-9366-3150f499502f" title="Meriana" alt="planet:Meriana">
-  <img width="30%" src="https://github.com/user-attachments/assets/7f20e7d1-a390-4050-8df6-3e8b5f1a6145" title="Hoven" alt="planet:Hoven">
+  <img width="30%" src="https://github.com/user-attachments/assets/27988862-2186-4704-97e3-5c1b579a1a8d" title="Meriana" alt="planet:Meriana">
+  <img width="30%" src="https://github.com/user-attachments/assets/b448e96c-f80d-4e39-b2ca-578db53095df" title="Hoven" alt="planet:Hoven">
+
 </div>
 <div align="center">
   <img width="30%" src="https://github.com/user-attachments/assets/94951339-dc6f-4f68-9ef2-259cc7b585eb" title="Rakken IV" alt="planet:Rakken IV">
-  <img width="30%" src="https://github.com/user-attachments/assets/9309ad14-6de0-4dc8-a37b-5b617395baf4" title="Rilgar" alt="planet:Rilgar">
+  <img width="30%" src="https://github.com/user-attachments/assets/6535c328-5765-4e19-8fb0-b50e547dc54e" title="Hermeus Major" alt="planet:Hermeus Major">
   <img width="30%" src="https://github.com/user-attachments/assets/476c8706-88a7-49c2-a6d2-2cd152207496" title="Xu'Alatl" alt="planet:Xu'Alatl">
 </div>
 
@@ -77,41 +76,51 @@ Vite copies the output to the `dist` folder, creating it first if need be.
 
 ### Editor
 
-- ☀️ **Lighting parameters!** (sunlight, ambient light)
+- ☀️ **Lighting parameters!** (sunlight, ambient light, color)
 - 🌍 **Planet & Rendering parameters!** (transform, water level, PBR settings)
-- 🗺️ **Surface parameters!** (bump mapping, noise settings, color ramp)
+- 🗺️ **Surface parameters!** (bump mapping, warping, displacement, noise settings, color ramp)
 - ⛰️ **Biome parameters!** (temperature/humidity mapping, per-biome min/max values & color)
-- ☁️ **Clouds parameters!** (transform, color, opacity ramp)
+- ☁️ **Clouds parameters!** (transform, warping, noise settings, color, opacity ramp)
 - 🌈 **Atmosphere parameters!** (density, color mixing modes)
+- 🪐 **Ring System parameters!** (radii, color ramp)
 
 ## ⏰ Planned features
 
 - Dark side "night lights"!
 - Cracks & Craters!
-- Gas Giants!
-- Rings & Asteroid belts!
+- Asteroid belts!
+- Planet animations!
 - _Galactic Map_, to organize them around stars!
 
-## ✨ Inspirations
+## ✨ Inspirations & credits
 
 This project is heavily inspired by the awesome projects below:
 
 - [PlanetMaker Chrome Experiment](https://planetmaker.apoapsys.com) (2013, Kevin M. Gill)
 - [NASA's Eye on Exoplanets](https://eyes.nasa.gov/apps/exo/#/) (Unknown date, NASA)
 
+**Special thanks** to the awesome people below, without whom this project would likely not exist:
+
+<ul>
+  <li>Main GLSL code snippets: <a href=\"https://iquilezles.org/\" target=\"_blank\"><b>Iñigo Quilez</b></a> (Voronoi + fBm), <a href=\"https://www.shadertoy.com/user/gltracy\" target=\"_blank\"><b>GLtracy</b></a> (atmosphere), <a href=\"https://andersonmancini.dev/\" target=\"_blank\"><b>Anderson Mancini</b></a> (lens flare)</li>
+  <li>Miscellaneous GLSL code: <a href=\"https://www.dangreenheck.com/\"><b>Daniel Greenheck</b></a> (bump-mapping)</li>
+</ul>
+
 ## 📓 Licensing
 
-Original assets and source code from this project are provided under a BSD 3-Clause "New" or "Revised" License.<br>
+The "Lagrange" logo, including _every_ update variant, is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International license ([CC BY-NC-SA 4.0 International](https://creativecommons.org/licenses/by-nc-sa/4.0/))
+
+Original assets and source code from this project are provided under the "I'm So Tired" Software License 1.0 - No-Resale version.<br>
 Please consult the [license file](LICENSE) for full information.
 
 Content from other parties is provided under their respective license, and attribution is given at the top of the aforementioned content.
 
 ## 🤝 Contributing
 
-If you want to contribute code, feel free to submit your PRs!
+If you'd like to contribute code, feel free to submit your PRs!
 
-Please make sure to respect the following:
+This project makes heavy use of the "Gitflow" branching model. To ensure proper branching, please make sure to respect the following steps:
 
-1. [fork the project](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project)
-2. create a branch from `develop`
-3. request your branch to be merged into `develop`
+1. [Fork the project](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project)
+2. Create a branch from `develop`
+3. Request your branch to be merged into `develop`

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lagrange",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -24,7 +24,7 @@
     "threejs"
   ],
   "author": "EepyBerry",
-  "license": "BSD-3-Clause",
+  "license": "ISTSL-NR 1.0",
   "dependencies": {
     "@floating-ui/vue": "^1.1.5",
     "@unhead/vue": "^1.11.10",

package.json

@@ -21,7 +21,7 @@ import AppInitDialog from '@components/dialogs/AppInitDialog.vue'
 import { useI18n } from 'vue-i18n'
 import { mapLocale } from './utils/utils'
 import { useHead } from '@unhead/vue'
-import { A11Y_ANIMATE } from './core/globals'
+import { A11Y_ANIMATE, EXTRAS_HOLOGRAM_MODE } from './core/globals'
 import AppToastBar from './components/main/AppToastBar.vue'
 import { EventBus } from './core/event-bus'
 
@@ -56,6 +56,7 @@ onMounted(async () => {
 
   // Set initial global values
   A11Y_ANIMATE.value = settings.value?.enableAnimations!
+  EXTRAS_HOLOGRAM_MODE.value = settings.value?.extrasHologramMode!
 
   // Open init dialog if necessary
   if (settings.value?.showInitDialog) {

src/App.vue

@@ -8,9 +8,14 @@ struct NoiseParameters {
     float amp;
     float lac;
     int oct;
+
+    float xwarp;
+    float ywarp;
+    float zwarp;
 };
 
 // Main uniforms
+uniform bool u_warp;
 uniform NoiseParameters u_noise;
 uniform vec3 u_color;
 uniform sampler2D u_opacity_tex;
@@ -25,16 +30,24 @@ const vec3 DVEC_A = vec3(0.1, 0.1, 0.0);
 const vec3 DVEC_B = vec3(0.2, 0.2, 0.0);
 
 void main() {
+    // Warping
+    vec3 wPos = vec3(
+        vPos.x * mix(1.0, u_noise.xwarp, float(u_warp)),
+        vPos.y * mix(1.0, u_noise.ywarp, float(u_warp)),
+        vPos.z * mix(1.0, u_noise.zwarp, float(u_warp))
+    );
+
+    // Clouds
     vec3 opacity = vec3(0.0);
     vec3 wOpacity = vec3(
-        fbm3(vPos,               u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct),
-        fbm3(vPos + DVEC_A,      u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct),
-        fbm3(vPos + DVEC_B,      u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct)
+        fbm3(wPos,               u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct),
+        fbm3(wPos + DVEC_A,      u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct),
+        fbm3(wPos + DVEC_B,      u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct)
     );
     if (wOpacity.x < 0.1) {
         discard;
     }
-    opacity += fbm3(vPos + wOpacity, u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct);
+    opacity += fbm3(wPos + wOpacity, u_noise.freq, u_noise.amp, u_noise.lac, u_noise.oct);
     opacity = texture2D(u_opacity_tex, vec2(opacity.x, 0.5)).xyz;
 
     csm_Metalness = 0.5;

src/assets/glsl/clouds.frag.glsl

@@ -1,10 +1,10 @@
 // Sourced from Brian Jackson (@jaxzin), using code from GLtracy:
 // https://glitch.com/~polite-playful-wool
-// https://www.shadertoy.com/view/lslXDr
 // ------------------------------------------------------------------------------------------------
 
 // Written by GLtracy
 // Credit: https://www.shadertoy.com/view/lslXDr
+// Note: original code licensed under CC BY-NC-SA 3.0 Unported license (see: atmosphere_utils.func.glsl_LICENSE)
 
 // math const
 const float PI = 3.14159265359;