Skip to content

Commit

Permalink
Merge pull request #3 from gopxl/feature/#1/update_references
Browse files Browse the repository at this point in the history
updated references to use gopxl
  • Loading branch information
duysqubix authored Oct 6, 2023
2 parents 27aca83 + d9dac59 commit 741f848
Show file tree
Hide file tree
Showing 49 changed files with 124 additions and 146 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Changelog for this and older versions can be found on the corresponding [GitHub
releases](https://github.com/faiface/pixel/releases).

[Unreleased]: https://github.com/duysqubix/pixel2/compare/v0.12.0...HEAD
[v0.12.0]: https://github.com/duysqubix/pixel2/compare/v0.12.0...dev
[Unreleased]: https://github.com/gopxl/pixel/compare/v0.12.0...HEAD
[v0.12.0]: https://github.com/gopxl/pixel/compare/v0.12.0...dev
[v0.10.0]: https://github.com/faiface/pixel/compare/v0.10.0-beta...v0.10.0
[v0.10.0-beta]: https://github.com/faiface/pixel/compare/v0.10.0-alpha...v0.10.0-beta
[v0.10.0-alpha]: https://github.com/faiface/pixel/compare/v0.9.0...v0.10.0-alpha
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

Go gives you a nice surprise when attempting to make a PR on Github. The thing is, that when user _xyz_ forks Pixel on Github, it ends up in _github.com/xyz/pixel_, which conflicts with your import paths. Here's how you deal with that: https://www.reddit.com/r/golang/comments/2jdcw1/how_do_you_deal_with_github_forking/.

[examples]: https://github.com/duysqubix/pixel2/tree/master/examples/community
[examples]: https://github.com/gopxl/pixel/tree/master/examples/community
44 changes: 22 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ Revived fork of the original [Pixel](https://github.com/faiface/pixel) library b
<p align="center"><img src="logo/LOGOTYPE-HORIZONTAL-BLUE2.png"></p>


# Pixel 2 [![Build Status](https://travis-ci.org/faiface/pixel.svg?branch=master)](https://travis-ci.org/faiface/pixel) [![GoDoc](https://godoc.org/github.com/duysqubix/pixel2?status.svg)](https://godoc.org/github.com/duysqubix/pixel2) [![Go Report Card](https://goreportcard.com/badge/github.com/duysqubix/pixel2)](https://goreportcard.com/report/github.com/duysqubix/pixel2) [![Join the chat at https://gitter.im/pixellib/Lobby](https://badges.gitter.im/pixellib/Lobby.svg)](https://gitter.im/pixellib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Discord Chat](https://img.shields.io/discord/699679031603494954)](https://discord.gg/q2DK4MP)
# Pixel 2 [![Build Status](https://travis-ci.org/faiface/pixel.svg?branch=master)](https://travis-ci.org/faiface/pixel) [![GoDoc](https://godoc.org/github.com/gopxl/pixel?status.svg)](https://godoc.org/github.com/gopxl/pixel) [![Go Report Card](https://goreportcard.com/badge/github.com/gopxl/pixel)](https://goreportcard.com/report/github.com/gopxl/pixel) [![Join the chat at https://gitter.im/pixellib/Lobby](https://badges.gitter.im/pixellib/Lobby.svg)](https://gitter.im/pixellib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Discord Chat](https://img.shields.io/discord/699679031603494954)](https://discord.gg/q2DK4MP)

A hand-crafted 2D game library in Go. Take a look into the [features](#features) to see what it can
do.

```
go get github.com/duysqubix/pixel2
go get github.com/gopxl/pixel
```

If you are using Modules (Go 1.11 or higher) and want a mutable copy of the source code:

```
git clone https://github.com/duysqubix/pixel2 # clone outside of $GOPATH
git clone https://github.com/gopxl/pixel # clone outside of $GOPATH
cd pixel2
go install ./...
```
Expand All @@ -28,17 +28,17 @@ Take a look at [CHANGELOG.md](CHANGELOG.md) for upcoming releases and history.

## Tutorial

The [Wiki of this repo](https://github.com/duysqubix/pixel2/wiki) contains an extensive tutorial
The [Wiki of this repo](https://github.com/gopxl/pixel/wiki) contains an extensive tutorial
covering several topics of Pixel. Here's the content of the tutorial parts so far:

- [Creating a Window](https://github.com/duysqubix/pixel2/wiki/Creating-a-Window)
- [Drawing a Sprite](https://github.com/duysqubix/pixel2/wiki/Drawing-a-Sprite)
- [Moving, scaling and rotating with Matrix](https://github.com/duysqubix/pixel2/wiki/Moving,-scaling-and-rotating-with-Matrix)
- [Pressing keys and clicking mouse](https://github.com/duysqubix/pixel2/wiki/Pressing-keys-and-clicking-mouse)
- [Drawing efficiently with Batch](https://github.com/duysqubix/pixel2/wiki/Drawing-efficiently-with-Batch)
- [Drawing shapes with IMDraw](https://github.com/duysqubix/pixel2/wiki/Drawing-shapes-with-IMDraw)
- [Typing text on the screen](https://github.com/duysqubix/pixel2/wiki/Typing-text-on-the-screen)
- [Using a custom fragment shader](https://github.com/duysqubix/pixel2/wiki/Using-a-custom-fragment-shader)
- [Creating a Window](https://github.com/gopxl/pixel/wiki/Creating-a-Window)
- [Drawing a Sprite](https://github.com/gopxl/pixel/wiki/Drawing-a-Sprite)
- [Moving, scaling and rotating with Matrix](https://github.com/gopxl/pixel/wiki/Moving,-scaling-and-rotating-with-Matrix)
- [Pressing keys and clicking mouse](https://github.com/gopxl/pixel/wiki/Pressing-keys-and-clicking-mouse)
- [Drawing efficiently with Batch](https://github.com/gopxl/pixel/wiki/Drawing-efficiently-with-Batch)
- [Drawing shapes with IMDraw](https://github.com/gopxl/pixel/wiki/Drawing-shapes-with-IMDraw)
- [Typing text on the screen](https://github.com/gopxl/pixel/wiki/Typing-text-on-the-screen)
- [Using a custom fragment shader](https://github.com/gopxl/pixel/wiki/Using-a-custom-fragment-shader)

## [Examples](https://github.com/faiface/pixel-examples)

Expand Down Expand Up @@ -77,15 +77,15 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea
- Fast 2D graphics
- Sprites
- Primitive shapes with immediate mode style
[IMDraw](https://github.com/duysqubix/pixel2/wiki/Drawing-shapes-with-IMDraw) (circles, rectangles,
[IMDraw](https://github.com/gopxl/pixel/wiki/Drawing-shapes-with-IMDraw) (circles, rectangles,
lines, ...)
- Optimized drawing with [Batch](https://github.com/duysqubix/pixel2/wiki/Drawing-efficiently-with-Batch)
- Text drawing with [text](https://godoc.org/github.com/duysqubix/pixel2/text) package
- Optimized drawing with [Batch](https://github.com/gopxl/pixel/wiki/Drawing-efficiently-with-Batch)
- Text drawing with [text](https://godoc.org/github.com/gopxl/pixel/text) package
- Audio through a separate [Beep](https://github.com/faiface/beep) library.
- Simple and convenient API
- Drawing a sprite to a window is as simple as `sprite.Draw(window, matrix)`
- Wanna know where the center of a window is? `window.Bounds().Center()`
- [...](https://godoc.org/github.com/duysqubix/pixel2)
- [...](https://godoc.org/github.com/gopxl/pixel)
- Full documentation and tutorial
- Works on Linux, macOS and Windows
- Window creation and manipulation (resizing, fullscreen, multiple windows, ...)
Expand All @@ -97,7 +97,7 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea
multiplication and a few more features
- Pixel uses `float64` throughout the library, compatible with `"math"` package
- Geometry transformations with
[Matrix](https://github.com/duysqubix/pixel2/wiki/Moving,-scaling-and-rotating-with-Matrix)
[Matrix](https://github.com/gopxl/pixel/wiki/Moving,-scaling-and-rotating-with-Matrix)
- Moving, scaling, rotating
- Easy camera implementation
- Off-screen drawing to Canvas or any other target (Batch, IMDraw, ...)
Expand All @@ -107,7 +107,7 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea
- Cutting holes into objects
- Much more...
- Pixel let's you draw stuff and do your job, it doesn't impose any particular style or paradigm
- Platform and backend independent [core](https://godoc.org/github.com/duysqubix/pixel2)
- Platform and backend independent [core](https://godoc.org/github.com/gopxl/pixel)
- Core Target/Triangles/Picture pattern makes it easy to create new drawing targets that do
arbitrarily crazy stuff (e.g. graphical effects)
- Small codebase, ~5K lines of code, including the backend [glhf](https://github.com/faiface/glhf)
Expand Down Expand Up @@ -141,10 +141,10 @@ possible!
## Requirements

If you're using Windows and having trouble building Pixel, please check [this
guide](https://github.com/duysqubix/pixel2/wiki/Building-Pixel-on-Windows) on the
[wiki](https://github.com/duysqubix/pixel2/wiki).
guide](https://github.com/gopxl/pixel/wiki/Building-Pixel-on-Windows) on the
[wiki](https://github.com/gopxl/pixel/wiki).

[PixelGL](https://godoc.org/github.com/duysqubix/pixel2/pixelgl) backend uses OpenGL to render
[PixelGL](https://godoc.org/github.com/gopxl/pixel/pixelgl) backend uses OpenGL to render
graphics. Because of that, OpenGL development libraries are needed for compilation. The dependencies
are same as for [GLFW](https://github.com/go-gl/glfw).

Expand All @@ -158,7 +158,7 @@ The OpenGL version used is **OpenGL 3.3**.
- See [here](http://www.glfw.org/docs/latest/compile.html#compile_deps) for full details.

**The combination of Go 1.8, macOS and latest XCode seems to be problematic** as mentioned in issue
[#7](https://github.com/duysqubix/pixel2/issues/7). This issue is probably not related to Pixel.
[#7](https://github.com/gopxl/pixel/issues/7). This issue is probably not related to Pixel.
**Upgrading to Go 1.8.1 fixes the issue.**

## Contributing
Expand Down
2 changes: 1 addition & 1 deletion circle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/duysqubix/pixel2"
"github.com/gopxl/pixel"
)

func TestC(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion color_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"image/color"
"testing"

"github.com/duysqubix/pixel2"
"github.com/gopxl/pixel"
)

func BenchmarkColorToRGBA(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pixel_test
import (
"testing"

"github.com/duysqubix/pixel2"
"github.com/gopxl/pixel"
)

func BenchmarkMakeTrianglesData(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion drawer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"image"
"testing"

"github.com/duysqubix/pixel2"
"github.com/gopxl/pixel"
)

func BenchmarkSpriteDrawBatch(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Pixel 2 Examples

This repository contains a few examples demonstrating [Pixel2](https://github.com/duysqubix/pixel2)'s functionality.
This repository contains a few examples demonstrating [Pixel2](https://github.com/gopxl/pixel)'s functionality.

**To run an example**, navigate to its directory, then `go run` the `main.go` file. For example:

Expand Down
4 changes: 2 additions & 2 deletions examples/guide/01_creating_a_window/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/guide/02_drawing_a_sprite/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/guide/04_pressing_keys_and_clicking_mouse/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/guide/05_drawing_efficiently_with_batch/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/guide/06_drawing_shapes_with_imdraw/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
import (
"math"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/guide/07_typing_text_on_the_screen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"time"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/duysqubix/pixel2/text"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"github.com/gopxl/pixel/text"
"github.com/golang/freetype/truetype"
"golang.org/x/image/colornames"
"golang.org/x/image/font"
Expand Down
6 changes: 3 additions & 3 deletions examples/lights/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
_ "image/jpeg"
_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
)

func loadPicture(path string) (pixel.Picture, error) {
Expand Down
6 changes: 3 additions & 3 deletions examples/multiwindows/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
import (
"fmt"

pixel "github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/duysqubix/pixel2/text"
pixel "github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"github.com/gopxl/pixel/text"
)

type EasyWindow1 struct {
Expand Down
6 changes: 3 additions & 3 deletions examples/platformer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

_ "image/png"

pixel "github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
pixel "github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
"github.com/pkg/errors"
"golang.org/x/image/colornames"
)
Expand Down
6 changes: 3 additions & 3 deletions examples/shader/exposure/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"math"
"time"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions examples/shader/exposure/psutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"io/ioutil"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
)

// Pixel Shader utility functions
Expand Down
6 changes: 3 additions & 3 deletions examples/shader/fastblur/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"math"
"time"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
"github.com/go-gl/mathgl/mgl32"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/shader/fastblur/psutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"io/ioutil"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
)

// Pixel Shader utility functions
Expand Down
4 changes: 2 additions & 2 deletions examples/shader/grayscale/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"image/png"
"os"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
)

var gopherimg *pixel.Sprite
Expand Down
6 changes: 3 additions & 3 deletions examples/shader/wavy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"time"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
)

var gopherimg *pixel.Sprite
Expand Down
4 changes: 2 additions & 2 deletions examples/smoke/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

_ "image/png"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/pixelgl"
"golang.org/x/image/colornames"
)

Expand Down
8 changes: 4 additions & 4 deletions examples/typewriter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"
"unicode"

"github.com/duysqubix/pixel2"
"github.com/duysqubix/pixel2/imdraw"
"github.com/duysqubix/pixel2/pixelgl"
"github.com/duysqubix/pixel2/text"
"github.com/gopxl/pixel"
"github.com/gopxl/pixel/imdraw"
"github.com/gopxl/pixel/pixelgl"
"github.com/gopxl/pixel/text"
"github.com/golang/freetype/truetype"
"golang.org/x/image/colornames"
"golang.org/x/image/font"
Expand Down
Loading

0 comments on commit 741f848

Please sign in to comment.