Skip to content

Commit

Permalink
Gigantic license changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dimkauzh committed Nov 11, 2024
1 parent 96f0f9c commit 1587a79
Show file tree
Hide file tree
Showing 26 changed files with 317 additions and 13 deletions.
4 changes: 4 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ SOFTWARE.
**4. Interpretation**

The decision on whether the software is unmaintained will be made by the original maintainer(s) or the designated project governance body, if any. In the absence of such a body, the community of contributors may reach a consensus according to the project's documented processes.

**5. Copyright on Artwork**

Any artwork associated with this software, including but not limited to logos, icons, and other visual assets, is copyrighted and licensed under the terms of the Primary License (GNU GPLv3 or later). However, if the software license changes to the MIT License under the conditions outlined in **Section 3**, this copyright on artwork no longer applies, and the artwork is included under the MIT License.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ proxy-release:

ci_check:
go build -o bin/test/test test/test/test.go
go build -o bin/test/backend test/backend/test.go

go build -o bin/examples/basic-window examples/basic-window/main.go
go build -o bin/examples/rectangle examples/rectangle/main.go
Expand Down Expand Up @@ -45,4 +46,3 @@ format:
go fmt ./examples/rectangle/
go fmt ./examples/two-windows/
go fmt ./examples/basic-window/

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,18 @@ func main() {

## 📚 Docs
Are you curious how to use Vuelto? Our docs are hosted on our website, so go [here](https://vuelto-org.github.io/vuelto/) to see them.


## 📋 Roadmap
Want to know which features are coming to Vuelto? You can find our [roadmap on the website](https://vuelto-org.github.io/vuelto/roadmap/v1).


## 🎉 Discord server
We have a [discord server at this link](https://discord.gg/gZqdRXbbqg). It's a fun server mainly created for vuelto, but you can talk about whatever you want. So come join us!

## 🤝 Contributing
We are fully open to contributions, but I will check and test your code before merging it into the dev branch. All your code thats accepted will only be merged into the dev branch, and will be later released with the next release.

## 🔐 License
Vuelto is licensed under the [GPLv3 Licence](LICENSE.md). Any PR's that go mainly about changing the licence won't be accepted.
Vuelto is licensed under a customised version of [VLv1 Licence](LICENSE.md). Any PR's that go mainly about changing the licence won't be accepted.

---
<h2 style="text-align: center;">Made for you by the Vuelto Team ❤️ </h2>

2 changes: 1 addition & 1 deletion internal/gl/legacy/gl.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#ifndef GL_H
#define GL_H
#define GL_SILENCE_DEPRECATION

#ifdef __APPLE__
#include <OpenGL/gl.h>
Expand All @@ -18,4 +19,3 @@
#endif

#endif

12 changes: 12 additions & 0 deletions internal/gl/legacy/legacy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package gl

/*
Expand Down
14 changes: 12 additions & 2 deletions internal/gl/opengl.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
//go:build windows || linux || darwin
// +build windows linux darwin

package gl
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

import gl "vuelto.me/internal/gl/opengl"
package gl

type VertexShader struct{}
type FragmentShader struct{}
Expand Down
14 changes: 12 additions & 2 deletions internal/gl/webgl.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
//go:build js && wasm
// +build js,wasm

package gl
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

import gl "vuelto.me/internal/gl/webgl"
package gl

type VertexShader struct{}
type FragmentShader struct{}
Expand Down
12 changes: 12 additions & 0 deletions internal/gl/webgl/binding.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
//go:build js && wasm
// +build js,wasm

/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package webgl

import (
Expand Down
12 changes: 12 additions & 0 deletions internal/image/image_go.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package image

import (
Expand Down
54 changes: 54 additions & 0 deletions internal/trita/type.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package trita

import (
"reflect"
)

const Func = reflect.Func

type TritaType struct {
Kind any
NumArguments int
ReflectValue reflect.Value
}

func NewTritaValue(Variable any) *TritaType {
varoutput := reflect.ValueOf(Variable)
return &TritaType{
Kind: varoutput.Kind(),
NumArguments: varoutput.Type().NumIn(),
ReflectValue: varoutput,
}
}

func (trita *TritaType) TypeArgument(ArgumentNum int) any {
return trita.ReflectValue.Type().In(ArgumentNum)
}

func YourType(Types any) any {
return reflect.TypeOf(Types)
}

func (trita *TritaType) Call(args ...any) []reflect.Value {
argumentsList := make([]reflect.Value, len(args))
for i, arg := range args {
argumentsList[i] = reflect.ValueOf(arg)
}
return trita.ReflectValue.Call(argumentsList)
}

func (trita *TritaType) HasReturn() bool {
return trita.ReflectValue.Type().NumOut() > 0
}
12 changes: 12 additions & 0 deletions internal/window/cocoa/cocoa.go
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package cocoa
12 changes: 12 additions & 0 deletions internal/window/wayland/wayland.go
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package wayland
12 changes: 12 additions & 0 deletions internal/window/web/canvas.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package web

import (
Expand Down
12 changes: 12 additions & 0 deletions internal/window/web/document.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package web

import "syscall/js"
Expand Down
12 changes: 12 additions & 0 deletions internal/window/web/window.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package web

import "syscall/js"
Expand Down
12 changes: 12 additions & 0 deletions internal/window/win32/win32.go
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package win32
12 changes: 12 additions & 0 deletions internal/window/win_glfw.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
//go:build windows || linux || darwin
// +build windows linux darwin

/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package windowing

import (
Expand Down
12 changes: 12 additions & 0 deletions internal/window/win_web.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
//go:build js && wasm
// +build js,wasm

/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package windowing

import (
Expand Down
12 changes: 12 additions & 0 deletions internal/window/x11/x11.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package x11

/*
Expand Down
12 changes: 12 additions & 0 deletions pkg/audio.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package vuelto

import (
Expand Down
14 changes: 13 additions & 1 deletion pkg/draw.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
/*
* Copyright (C) 2024 vuelto-org
*
* This file is part of the Vuelto project, licensed under the Vuelto License V1.
* Primary License: GNU GPLv3 or later (see <https://www.gnu.org/licenses/>).
* If unmaintained, this software defaults to the MIT License as per Vuelto License V1,
* at which point the copyright no longer applies.
*
* Distributed WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/

package vuelto

import "vuelto.me/internal/gl/legacy"
import gl "vuelto.me/internal/gl/legacy"

// Draws a new rect by the given x, y, width, height and color
func (r *Renderer2D) DrawRect(x, y, width, height float32, color [4]int) {
Expand Down
Loading

0 comments on commit 1587a79

Please sign in to comment.