Update to latest pyopengl

and the last pyglet 1.x, and use uv instead of pipfile.

Author: tartley

.python-version

@@ -0,0 +1 @@
+3.14

CHANGES.md

@@ -0,0 +1,13 @@
+
+# 0.2 Aug 2026
+
+Fixup to work with uv instead of Pipenv, latest PyOpenGL, last v1.x pyglet,
+and Python 3.14.
+
+Add --screen command-line option to choose a screen to run on (integers from 0,
+detected screen numbers are printed on startup.)
+
+# 0.1.3a April 2011
+
+* Public announcement of code at PyCon talk
+

CHANGES.txt

@@ -7,73 +7,31 @@
 
 
 NAME := gloopy
-SCRIPT := run.py
-VERSION := $(shell python -c "from ${NAME} import VERSION; print(VERSION)")
+VERSION := $(shell uv run python -c "from ${NAME} import VERSION; print(VERSION)")
 
+help:  ## Show this help.
+	@# Optionally add 'sort' before 'awk'
+	@grep -E '^[^_][a-zA-Z_\/\.%-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-10s\033[0m %s\n", $$1, $$2}'
+.PHONY: help
 
-help:
-	@echo This Makefile has no default target.
+get-version:  ## Print version number to stdout
+	@echo $(VERSION)
 
-
-test:
-	python -m unittest discover gloopy
+test:  ## Run tests
+	uv run python -m unittest discover gloopy
 .PHONY: tests
 
-
-# runsnake is a GUI profile visualiser, very useful.
-# http://www.vrplumber.com/programming/runsnakerun/
-profile:
-	python -O -m cProfile -o profile.out ${SCRIPT}
-	runsnake profile.out
-.PHONY: profile
-
-
-clean:
+clean:  ## Delete generated files
 	rm -rf build dist *.egg-info tags pip-log.txt
 	-find . \( -name "*.py[oc]" -o -name "*.orig" -o -name "*.rej" \) -exec rm {} \;
 	$(MAKE) -C docs clean
 .PHONY: clean
 
-
 tags:
 	ctags -R ${NAME}
 .PHONY: tags
 
-
-docs:
-	@$(MAKE) -C docs
-.PHONY: docs
-
-
-sdist: docs
-	rm -rf dist/${NAME}-${VERSION}.* build
-	python setup.py sdist
-.PHONY: sdist
-
-
-register: docs
-	rm -rf dist/${NAME}-${VERSION}.* build
-	python setup.py --quiet sdist register
-.PHONY: register
-
-
-upload: docs
-	rm -rf dist/${NAME}-${VERSION}.* build
-	python setup.py --quiet sdist register upload
-.PHONY: upload
-
-
-py2exe:
-	rm -rf dist/${NAME}-${VERSION}-windows build
-	python setup.py --quiet py2exe
-.PHONY: py2exe
-
-
-stats:
-	@echo "non-blank lines of code:"
-	@echo -n 'product: '
-	@find ${NAME} -name '*.py' | grep -v "/tests/" | xargs cat | grep -cve "^\W*$$"
-	@echo -n 'tests: '
-	@find ${NAME} -name '*.py' | grep "/tests/" | xargs cat | grep -cve "^\W*$$"
-.PHONY: stats
+# Building docs doesn't currently work
+# It was a bit misguided, this project is a wacky personal experiment,
+# it doesn't need that kind of documentation anyway
 

Makefile

@@ -31,18 +31,16 @@ but pyglet.gl for performance critical OpenGL calls.
 
 # Dependencies
 
-- Originally written on Windows, run occasionally on OSX, and all recent
-development on Ubuntu.
+- Originally written on Windows, then on OSX, and all recent development on
+  Ubuntu.
 
-- Python 3.6
+- Dependencies are managed by uv.
 
-This project does not use pip. Instead we track our dependencies using
-the newer '[Pipenv](https://docs.pipenv.org/)', built
-on top of pip. So instead of `pip install ...`, it should just be a `pipenv
-install`, but:
+- Python 3.x, tried up to 3.14
 
 - Our Python dependencies (PyOpenGL, etc) aren't available as pre-compiled
-  wheels, so installing them requires you are able to compile and link:
+  wheels, so installing them requires you are able to compile and link. uv
+  might take care of this automatically, but if not, try:
 
       # On Ubuntu
       sudo apt-get update
@@ -53,16 +51,10 @@ install`, but:
       # On Ubuntu, if your Python3 was installed using 'apt', then:
       sudo apt install python3.6-dev
 
-- Then you can install Python dependencies, as specified in 'Pipfile':
-
-      pip install --user pipenv
-      pipenv install
-
 # Running
 
-Execute `run.py` from within the gloopy virtualenv, eg:
-
-    pipenv run ./run.py
+Execute `run.py` from within the gloopy virtualenv, see the script 'run'
+for the reference example of how to do that.
 
 You should be presented with an orange fullscreen window.
 

Pipfile

@@ -3,16 +3,16 @@
 - Delete examples that do not work.
 - Tidy the changes from pyMNtos
     (one of the new features I thought was coded foolishly)
-- Update to pyopengl3.1 (requires new approach to buffers or something)
 - faces, instead of having integer attributes, should be grouped into
   a set of sets, or something. This actually lends itself to adding
   transparent stuff later.
-- MANIFEST.in should be generated by setup.py
 - space invaders show seam glitches (remove size mults to fix this and
   to understand how it was introduced)
-
+- space invaders should be oriented differently. All facing the direction of
+  rotation?
 - Consider eliminating the ability to modify shapes in-place, especially since
-  this doesn't play nice with multishapes generator properties.
+  this doesn't play nice with multishapes generator properties. Instead replace
+  a shape with a modified copy.
 - if same shape is assigned to many items, it gets a separate glyph in each
   case. glyphs should not be stored as attribute of item. They should be
   stored in the view, in a dictionary of {shape_id: glyph}.
@@ -25,65 +25,6 @@
 - When an in-world item is assigned a new shape, or when a shape is modified,
   it should fire an event that causes the corresponding glyph to be regenerated.
 
-# Inspiration
-
-complicated saddle surfaces with holes:
-http://www.cs.berkeley.edu/~sequin/SCULPTS/scherk.html
-
-building skyline at night:
-http://www.openbusiness.cc/wp-content/uploads/hk1.jpg
-
-bulbous blobs with holes
-http://www.cs.berkeley.edu/~sequin/MVS/index.html
-http://www.graphica.com/gallery/trott1.html
-
-Sections of a sphere:
-http://www.cs.berkeley.edu/~sequin/ART/MaxBill/MBTy5.jpg
-
-screenshots on the geexlab website
-
-Seirpinky cubes with floating debris:
-http://www.youtube.com/user/xenopusRTRT#p/u/2/SDzZchuhECY
-
-# Rendering
-
-* better shaders:
-    * ambient light level should be a uniform
-        * demo should populate this using world.background_color
-    * directional light position & color should be uniforms
-        * demo should assign these
-    * point light source position & color should be uniforms
-        * demo should attach point light source to a moving item
-    * specular highlights from directional light
-    * specular highlights from point light
-    * per pixel lighting so that specular highlights in middle of flat faces
-      look good
-    * Textures. See:
-      http://www.lighthouse3d.com/opengl/glsl/index.php?textureComb
-    * demo should draw a 'sun' or 'moon' or somesuch
-      in direction of directional light source
-
-* fix your timestep. In particular, some way to reduce jittery movement
-  caused by isolated slow or fast frames.
-
-# Documentation
-
-* sdist documentation images are included twice
-* sdist documentation should not be in html subdir
-* documentation should not include test packages
-* pip install should install deps, e.g. pyglet, popengl
-* Readme cannot contain class links, but we'd like the intro.rst (derived
-  from it) to do so. Some sort of copy with a search-and-replace?
-
-# Screen resolution
-
-* key to flip from one screen to another when fullscreen
-* Convert options to use argparse, so that it can provide command line usage
-* command-line option to select screen resolution on startup (if used, then
-  restore desktop resolution on exit)
-* keys or something to select new screen resolution during runtime
-* persist user's chosen screen resolution
-
 # OpenGL 3
 
 * VBO the index array

Pipfile.lock

@@ -0,0 +1,22 @@
+[project]
+name = "gloopy"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+authors = [
+    { name = "Jonathan Hartley", email = "tartley@tartley.com" }
+]
+requires-python = ">=3.14"
+dependencies = [
+    "numpy>=2.5.1",
+    "pyglet<2",
+    "pyopengl",
+    "pyopengl-accelerate",
+]
+
+[project.scripts]
+gloopy = "gloopy:main"
+
+[build-system]
+requires = ["uv_build>=0.12.2,<0.13.0"]
+build-backend = "uv_build"

README.md

@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-pipenv run python -O gloopy/run.py 2>gloopy.log
-
+uv run python -O src/gloopy/run.py "$@"