Merge branch 'master' into release

.clang-format

@@ -1,93 +1,9 @@
 ---
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
+BasedOnStyle: LLVM
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ TAILQ_FOREACH, SPLAY_FOREACH, RB_FOREACH, WITH_MTX_LOCK,
-                   WITH_SPIN_LOCK, WITH_RW_LOCK, SET_FOREACH, LIST_FOREACH,
-                   TAILQ_FOREACH_REVERSE, TAILQ_FOREACH_SAFE,
-                   LIST_FOREACH_SAFE, WITH_VM_MAP_LOCK ]
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
+IndentCaseBlocks: true
 IndentCaseLabels: true
-IndentWidth:     2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-ReflowComments:  true
-SortIncludes:    false
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
-UseTab:          Never
-...
-
+SortIncludes: Never

intro/Makefile

@@ -41,7 +41,7 @@ CLEAN-FILES := main.o \
 	data/electric.c data/lifeforms.c \
 	data/circles.c data/squares.c data/whirl.c \
 	data/grass.c data/loader.c \
-	data/texture-{in,out}side.c data/gradient.c data/gradient.png \
+	data/texture-{in,out}side.c data/uv*-gradient.c data/uv*-gradient.png \
 	data/tilemover-*.c data/chip.c data/wireworld-pcb-pal.c \
 	data/pal-gold*.c data/pal-green*.c data/pal-red*.c data/pal-blue*.c \
 	data/tree-pal-*.c
@@ -68,6 +68,7 @@ PNG2C.tree-pal-electric := --palette tree_pal_electric,32
 PNG2C.fruit-1 := --bitmap fruit_1,16x16x2,+onlydata
 PNG2C.fruit-2 := --bitmap fruit_2,16x16x2,+onlydata
 PNG2C.grass := --sprite grass,32,8
+PNG2C.electric-small := --sprite electric,32,5 --palette electric_pal,16,+store_unused
 PNG2C.tilemover-pal := --palette tilemover_pal,16
 PNG2C.ghostown-logo-crop := --pixmap ghostown_logo,192x131x4,+onlydata,+displayable
 PNG2C.ghostown-logo-01 := --palette ghostown_logo_1_pal,8
@@ -83,7 +84,7 @@ PNG2C.loader := --bitmap loader,64x64x1 --palette loader_pal,2
 PNG2C.electric := --bitmap electric_logo,160x64x1,+shared
 PNG2C.lifeforms := --bitmap lifeforms_logo,160x64x1,+shared
 PNG2C.anemone-gradient := --palette anemone_gradient_pal,16
-PNG2C.whirl := --sprite whirl,64,4 --palette whirl_pal,4
+PNG2C.whirl := --sprite whirl,64,4 --palette whirl_pal,16,+store_unused
 
 PNG2C.circles := \
 	--bitmap circle1,3x3x1,extract_at=0x0 \
@@ -146,7 +147,9 @@ PNG2C.tilemover-bg-pal := --palette tilemover_bg_pal,6
 
 PNG2C.texture-inside := --pixmap texture_in,64x64x8,+onlydata --palette texture_pal,16
 PNG2C.texture-outside := --pixmap texture_out,64x64x8,+onlydata
-PNG2C.gradient := --pixmap gradient,16x16x12,+onlydata
+PNG2C.uvgut-gradient := --pixmap uvgut_gradient,16x16x12,+onlydata
+PNG2C.uvtit-gradient := --pixmap uvtit_gradient,16x16x12,+onlydata
+PNG2C.gol-transitions := --pixmap gol_transitions,3x46x12,+onlydata
 
 CPPFLAGS += -DINTRO -DVQ=$(VQ) -DDELTA=$(DELTA) -DKLANG=$(KLANG) -I.
 
@@ -203,10 +206,19 @@ data/%.png: data/%.rle
 	@echo "[RLE] $(DIR)$< -> $(DIR)$@"
 	$(PYTHON3) $(RLE2PNG) $< $@ || (rm -f $@ && exit 1)
 
-data/gradient.png: $(GRADIENT) data/texture-inside.png
+data/uvgut-gradient.png: $(GRADIENT) data/texture-inside.png
+	@echo "[GEN] $@"
+	$(PYTHON3) $(GRADIENT) load $(word 2,$^) copy hue 0.495 save $@
+
+data/uvtit-gradient.png: $(GRADIENT) data/texture-inside.png
 	@echo "[GEN] $@"
 	$(PYTHON3) $(GRADIENT) load $(word 2,$^) copy hue 0.4 save $@
 
+data/gol-transitions.png: $(GRADIENT)
+	@echo "[GEN] $@"
+	$(PYTHON3) $(GRADIENT) load data/gol-pal-1.png load data/gol-pal-2.png \
+	load data/gol-pal-3.png load data/gol-pal-4.png save $@
+
 %.exe.packed: %.exe
 	@echo "[PACK] $(DIR)$< -> $(DIR)$@"
 	Shrinkler -o -f 0xdff180 $< $@