Cleanup

More tweaking needs to be done, after deciding a max width for selection
items.

.ghci

@@ -1 +1,2 @@
 :set prompt ">"
+:load test/Spec.hs

.ghcid

@@ -1 +1 @@
---command "stack ghci --main-is loop:exe:dodge"
+--command "stack ghci --test --main-is loop:test:loop-test --ghci-options=-fobject-code"

.gitignore

@@ -6,3 +6,7 @@ loop.cabal
 keys.json
 log/*
 generated/*
+UntrackedMisc/*
+tags
+ghcidOutput
+.ghcid.bak

.hlint.yaml

@@ -0,0 +1,71 @@
+# HLint configuration file
+# https://github.com/ndmitchell/hlint
+##########################
+
+# This file contains a template configuration file, which is typically
+# placed as .hlint.yaml in the root of your project
+
+
+# Specify additional command line arguments
+#
+# - arguments: [--color, --cpp-simple, -XQuasiQuotes]
+
+
+# Control which extensions/flags/modules/functions can be used
+#
+# - extensions:
+#   - default: false # all extension are banned by default
+#   - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
+#   - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
+#
+# - flags:
+#   - {name: -w, within: []} # -w is allowed nowhere
+#
+# - modules:
+#   - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
+#   - {name: Control.Arrow, within: []} # Certain modules are banned entirely
+#
+# - functions:
+#   - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
+
+
+# Add custom hints for this project
+#
+# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
+# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
+
+# The hints are named by the string they display in warning messages.
+# For example, if you see a warning starting like
+#
+# Main.hs:116:51: Warning: Redundant ==
+#
+# You can refer to that hint with `{name: Redundant ==}` (see below).
+
+# Turn on hints that are off by default
+#
+# Ban "module X(module X) where", to require a real export list
+#- warn: {name: Use explicit module export list} # TODO uncomment
+#
+# Replace a $ b $ c with a . b $ c
+#- group: {name: dollar, enabled: true} # TODO uncomment
+#
+# Generalise map to fmap, ++ to <>
+#- group: {name: generalise, enabled: true} # TODO uncomment
+#
+# Warn on use of partial functions
+# - group: {name: partial, enabled: true} # possibly uncomment
+
+- group: {name: use-lens, enabled: true}
+
+# Ignore some builtin hints
+# - ignore: {name: Use let}
+# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
+
+- ignore: {name: Functor law}
+
+# Define some custom infix operators
+# - fixity: infixr 3 ~^#^~
+
+
+# To generate a suitable file for HLint do:
+# $ hlint --default > .hlint.yaml

appDodge/Main.hs

@@ -1,13 +1,10 @@
-module Main (
-    main,
-) where
+module Main (main) where
 
-import Dodge.StartNewGame
+import Dodge.SoundSelection
 import Control.Lens
 import Control.Monad
 import Control.Parallel
 import qualified Data.Map.Strict as M
---import Data.Preload.Render
 import qualified Data.Text as T
 import Dodge.Concurrent
 import Dodge.Config
@@ -15,25 +12,19 @@ import Dodge.Data
 import Dodge.Event
 import Dodge.Initialisation
 import Dodge.LoadSeed
---import Dodge.Menu
 import Dodge.Render
 import Dodge.SoundLogic.LoadSound
+import Dodge.StartNewGame
 import Dodge.TestString
 import Dodge.Update
---import qualified IntMapHelp as IM
 import Loop
---import Picture
 import Preload
 import Preload.Render
---import Render
-
 import SDL (($=))
 import qualified SDL
---import qualified SDL.Mixer as Mix
 import Sound
 import System.Directory
 
-
 main :: IO ()
 main = do
     -- load the config to get the window size and position
@@ -97,8 +88,12 @@ firstWorldLoad theConfig = do
                 , _uvDebug = mempty
                 , _uvDebugFloat1 = 10
                 , _uvDebugFloat2 = 0
+                , _uvDebugV2_1 = 0
+                , _uvDebugV2_2 = 1
+                , _uvDebugPut = mempty
                 , _uvDebugMessageOffset = 0
                 , _uvSoundQueue = mempty
+                , _uvDebugPathShowType = PathBetweenDebugV2s
                 }
     --return $ u & uvScreenLayers .~ [splashMenu u]
     return $ startNewGameInSlot 0 u
@@ -108,12 +103,14 @@ theUpdateStep win = doSideEffects <=< updateRenderSplit win
 
 updateRenderSplit :: SDL.Window -> Universe -> IO Universe
 updateRenderSplit win u = do
-    updateUniverse u `par` void (doDrawing win u)
+    --updateUniverse u `par` void (doDrawing win u)
+    updateUniverse u `par` doDrawing win u
     return $! updateUniverse u
 
 playSoundUnlessRewinding :: Universe -> IO (M.Map SoundOrigin Sound)
 playSoundUnlessRewinding u = case w ^. timeFlow of
-    NormalTimeFlow -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (_toPlaySounds w)
+    NormalTimeFlow -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (newSoundsToPlay u)
+    RespawnDelay{} -> playSoundAndUpdate (_soundData $ _preloadData u) (_playingSounds w) (newSoundsToPlay u)
     _ -> stopAllSounds >> return M.empty
   where
     w = _uvWorld u
@@ -140,13 +137,13 @@ doPreload = do
     putStrLn "Start sound preload"
     lChunks <- loadSounds
     putStrLn "Skip music preload!"
---    lMusic <- loadMusic
---    Mix.playMusic Mix.Forever (lMusic IM.! 0)
+    --    lMusic <- loadMusic
+    --    Mix.playMusic Mix.Forever (lMusic IM.! 0)
     putStrLn "Return PreloadData"
     return
         PreloadData
             { _renderData = rData
             , _soundData = lChunks
-            --, _musicData = MusicData{_loadedMusic = lMusic}
-            , _musicData = mempty
+            , --, _musicData = MusicData{_loadedMusic = lMusic}
+              _musicData = mempty
             }

data/terminalConversations/aiInterface

@@ -0,0 +1,40 @@
+The cortical interface is an incredible interdisciplinary breakthrough 
+in neurophysiology and computer science.
+It allows clients to directly receive information transmitted wirelessly.
+We expect this to allow for better, faster learning, allowing 
+humans to reach unheard of levels of knowledge and ability.
+
+Non-human animal trials did not appear to reduce lifespans significantly.
+Human trials are now in progress.
+
+I hate the way the interface just dumps information on you. 
+The way time just seems to stop... 
+makes me feel sick.
+
+I heard @name downloaded War and Peace, 
+but didn't expect it to be in russian.
+Took him a week to recover.
+
+What's the deal with the cortical interface?
+So, like, what happens if I constantly request info dumps? 
+Does that mean I live forever?
+
+Temporal distortion is a common side effect when using the cortical interface.
+Information is processed near instantaneously, causing other
+external events to appear paused.
+
+The cortical interface has some neat uses.
+I set up a timer to remind me of our anniversary.
+It's great, the AI even suggested the perfect present!
+
+Mood disorders.
+
+Anxiety.
+
+Epilepsy.
+
+Dizzyness, nauseau, tinitus.
+
+Autism.
+
+Schizoprenia.

data/terminalConversations/hubConversation.csv

@@ -0,0 +1,18 @@
+Where am I? What year is this? When is this?,Error: Impossible to determine. Cannot resolve with known frame. Presumed outside Earth light cone.
+What is this place?,Central hub. Corrupted zones have been sealed off.
+Who am I?,"Error: Unkown referent: “I”. Cannot determine what “I” refers to. Possible partial referent: Biological form generated x miliseconds. Partial list features: torso, four limbs, head w/ partial configuration of scanned data."
+Who are you?,"Error: Unknown referent: “you”. Terminal connected distributed system, unknown extent."
+What should I do?,Error: Unknown objective function. Module “Cat.Imperative” missing.
+Are you an AI?,"Terminal connected to distributed system, unkown extent. Can generate respose to finite queries."
+How did I get here?,Generated from blueprints and brain scan transmitted in unkown past.
+Can you heal me?,Full regeneration upon termination in areas external to central hub. WARNING: Cannot regenerate upon termination within central hub.
+What can you do?,"Item synthesis in terminal (over there), requires blueprint. Transport to defective zones."
+What are my capabilities?,Err. Basic movement and item acquisition. Items confer new capabilities. WARNING: carry capacity restricted.
+How do I get more powerful?,Carry capacity restoration possible: acquire module through door to north.
+What is through that door?,Error: Cannot exhaustively describe location. 
+Can you be less useful?,"Error: No objective function, try “set verbose”. Cannot determine utility of response."
+What are your capabilities?,Error: Parse “your → you”: Unknown referent “you”.
+,Error: Parse fail
+Do you have memory/hard drive?,All events logged with error correction. Future corruption inevitable. Unkown total bits of storage used/available across network.
+How long have you existed?,System clock: (random number) + game time
+What seed?,

data/terminalConversations/tutScenarioStart

@@ -0,0 +1,9 @@
+Something has gone wrong.
+
+My last memory is entering the reconstitution scanner.
+Though experimental, 
+this techology theoretically allows for perfect duplication.
+But there are strict rules, this would only happen if my old body is... 
+non-functional.
+
+Hopefully I can take better care of this one.

dodge.aux

@@ -1,42 +1,42 @@
-X_RANGE 38.37
-Y_RANGE 9447512.00
+X_RANGE 11.40
+Y_RANGE 20574456.00
 ORDER OTHER 1
-ORDER (157697)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 2
-ORDER (165654)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 3
-ORDER (165606)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 4
-ORDER (155261)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 5
-ORDER (157606)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 6
-ORDER (157522)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 7
-ORDER (144146)ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExists/updateI... 8
-ORDER (157678)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 9
-ORDER (159529)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 10
-ORDER (165621)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 11
-ORDER (181320)#..\/#./crSetRoots.f/ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySe... 12
-ORDER (152512)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 13
-ORDER (158152)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 14
-ORDER (162804)listSelectionColorPicture.g/listSelectionColorPicture/updateSection.(...)/updateSection/updateSe... 15
-ORDER (181178)crUpdateInvidLocations/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExist... 16
-ORDER (159623)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 17
-ORDER (159633)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 18
-ORDER (163282)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 19
-ORDER (157730)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 20
+ORDER (13951)updateEdgeWallObs 2
+ORDER (14169)updateDisplaySections,updateEdgeWallObs 3
+ORDER (14505)SYSTEM,updateDisplaySections,doDrawing',colCrsWalls,updateEdgeWallObs 4
+ORDER (13997)updateEdgeWallObs 5
+ORDER (13996)updateEdgeWallObs 6
+ORDER (14223)SYSTEM,updateDisplaySections,updateEdgeWallObs 7
+ORDER (14009)updateEdgeWallObs 8
+ORDER (14027)updateEdgeWallObs,ix 9
+ORDER (13964)SYSTEM,updateEdgeWallObs 10
+ORDER (13953)updateEdgeWallObs 11
+ORDER (14086)updateEdgeWallObs,ix 12
+ORDER (14099)updateEdgeWallObs,ix 13
+ORDER (14085)updateEdgeWallObs,ix 14
+ORDER (14030)updateEdgeWallObs,ix 15
+ORDER (14175)SYSTEM,updateDisplaySections,updateEdgeWallObs 16
+ORDER (2)SYSTEM 17
+ORDER (13952)SYSTEM,updateEdgeWallObs 18
+ORDER (13941)updateEdgeWallObs 19
+ORDER (14018)updateEdgeWallObs,ix 20
 SHADE OTHER 0.00
-SHADE (157697)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 0.00
-SHADE (165654)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
-SHADE (165606)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
-SHADE (155261)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.10
-SHADE (157606)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 0.10
-SHADE (157522)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 0.10
-SHADE (144146)ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExists/updateI... 0.10
-SHADE (157678)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 0.00
-SHADE (159529)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 0.00
-SHADE (165621)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 0.00
-SHADE (181320)#..\/#./crSetRoots.f/ix/crSetRoots/crUpdateItemLocations/scrollAugNextInSection/checkInventorySe... 0.00
-SHADE (152512)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.05
-SHADE (158152)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.05
-SHADE (162804)listSelectionColorPicture.g/listSelectionColorPicture/updateSection.(...)/updateSection/updateSe... 0.05
-SHADE (181178)crUpdateInvidLocations/crUpdateItemLocations/scrollAugNextInSection/checkInventorySelectionExist... 0.05
-SHADE (159623)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 0.10
-SHADE (159633)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 0.10
-SHADE (163282)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 0.10
-SHADE (157730)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.10
+SHADE (13951)updateEdgeWallObs 0.00
+SHADE (14169)updateDisplaySections,updateEdgeWallObs 0.00
+SHADE (14505)SYSTEM,updateDisplaySections,doDrawing',colCrsWalls,updateEdgeWallObs 0.00
+SHADE (13997)updateEdgeWallObs 0.10
+SHADE (13996)updateEdgeWallObs 0.10
+SHADE (14223)SYSTEM,updateDisplaySections,updateEdgeWallObs 0.10
+SHADE (14009)updateEdgeWallObs 0.10
+SHADE (14027)updateEdgeWallObs,ix 0.00
+SHADE (13964)SYSTEM,updateEdgeWallObs 0.00
+SHADE (13953)updateEdgeWallObs 0.00
+SHADE (14086)updateEdgeWallObs,ix 0.00
+SHADE (14099)updateEdgeWallObs,ix 0.05
+SHADE (14085)updateEdgeWallObs,ix 0.05
+SHADE (14030)updateEdgeWallObs,ix 0.05
+SHADE (14175)SYSTEM,updateDisplaySections,updateEdgeWallObs 0.05
+SHADE (2)SYSTEM 0.10
+SHADE (13952)SYSTEM,updateEdgeWallObs 0.10
+SHADE (13941)updateEdgeWallObs 0.10
+SHADE (14018)updateEdgeWallObs,ix 0.10

package.yaml

@@ -25,16 +25,16 @@ dependencies:
 - aeson-pretty
 - containers
 - deepseq
-- dlist
+#- dlist
 - directory
 - extra
 - foldl
-- graphviz
+#- graphviz
 - OpenGLRaw
 - text
 - bytestring
 - lens
-- mtl
+#- mtl
 - fgl
 - JuicyPixels
 - random
@@ -50,11 +50,12 @@ dependencies:
 - primitive
 - monad-parallel
 - parallel
-- Clipboard
 - tasty
 - tasty-hunit
 - tasty-quickcheck
 - list-tries
+- Hclip
+- search-algorithms
 
 library:
   source-dirs: src
@@ -80,7 +81,7 @@ executables:
     - -fno-state-hack
     - -funfolding-use-threshold1000 
     #- -funfolding-keeness-factor1000 
-    - -fllvm 
+#    - -fllvm 
     - -optlo-O3
     - -Wall
     #- -Wcompat
@@ -120,7 +121,7 @@ benchmarks:
         - -fno-state-hack
         - -funfolding-use-threshold1000 
           #        - -funfolding-keeness-factor1000 
-        - -fllvm 
+#        - -fllvm 
           #- -optlo-O3
         main:         Bench.hs
         source-dirs:  bench

saveSlot/seed

@@ -1 +0,0 @@
-7114951007332849727

shader/ceiling/stencil.vert

@@ -0,0 +1,13 @@
+#version 450 core
+struct PosTex { vec4 pospos; vec4 texang; };
+layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
+layout (std430, binding = 2) readonly buffer Pos { PosTex data[]; };
+int indices[6] = {0,1,3,0,3,2};
+void main()
+{
+    vec4 pp = data[gl_VertexID / 6].pospos;
+    int j = indices[gl_VertexID % 6];
+    float z = (j / 2 > 0.5 ? 5000 : 100);
+    vec2 xy = (j % 2 > 0 ? pp.xy : pp.zw);
+    gl_Position = theMat * vec4(xy,z,1);
+}

shader/chasm.vert

@@ -0,0 +1,6 @@
+#version 450 core
+layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
+layout (std430, binding = 7) readonly buffer Pos { vec2 pos[]; };
+void main() {
+  gl_Position = theMat * vec4(pos[gl_VertexID],0,1);
+}

shader/cloud/basic.frag

@@ -1,27 +1,18 @@
 #version 450 core
 in vec4 vPosID;
 in vec4 vCol;
-in vec4 vCenterSize;
 in vec4 vControls;
 layout (location=0) out vec4 fCol;
 layout (location=1) out vec4 fPos;
 layout (location=2) out vec4 fNorm;
 void main()
 {
-    // there are quite a few intricate controls concerning the normals
-    // we want normals to be bigger towards the center, so that when two clouds
-    // are blended central normals predominate
-    // similarly, we want normals to be bigger the further up the cloud is
-    // finally, we want normals to allow for shadows at the edge of a cloud
-    // when a light is direcly above the cloud
     float d = dot(vControls,vControls);
     if (d > 1) {discard;}
-    //fCol = vCol;
     fCol = vec4(vCol.xyz,vCol.w*(1-d));
-    //float rad = vCenterSize.w*0.5;
-    float rad = vCenterSize.w;
-    float h = (1-d) * rad;
-    fPos = vec4(vPosID.xy, vPosID.z + h, vCol.w*(1-d));
-    vec3 fn1 = fPos.z*normalize(vec3(vCenterSize.xyz - fPos.xyz));
-    fNorm = vec4(fn1,fPos.w);
+    fPos = vec4(vPosID.xyz, vCol.w*(1-d));
+    //fPos = vec4(vPosID.xy,vPosID.z*0.5, vCol.w*(1-d));
+    fNorm = vec4(-vControls.xy, -0.1 + 0.2 * d ,fPos.w);
+    //fNorm = vec4(-vControls.xy, -0.1 + 2 * d ,vCol.w * (1.01-(d*d*d)));
+    //fNorm = vec4(-vControls.xy, -0.1 + d , fPos.w);
 }

shader/cloud/basic.vert

@@ -1,18 +1,15 @@
 #version 450 core
 layout (location = 0) in vec4 posID;
 layout (location = 1) in vec4 col;
-layout (location = 2) in vec4 centerSize;
-layout (location = 3) in vec4 controls;
+layout (location = 2) in vec4 controls;
 layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
 out vec4 vPosID;
 out vec4 vCol;
-out vec4 vCenterSize;
 out vec4 vControls;
 void main()
 {
   gl_Position = theMat * vec4(posID.xyz,1);
   vPosID = posID;
   vCol = col;
-  vCenterSize = centerSize;
   vControls = controls;
 }

shader/dualTwoD/arc.vert

@@ -1,14 +0,0 @@
-#version 450 core
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec4 col;
-layout (location = 2) in vec3 boxXboxYwidth;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 vCol;
-out vec3 vPos;
-out vec3 vparams;
-void main() {
-  gl_Position = theMat * vec4(pos,1);
-  vCol = col;
-  vparams = boxXboxYwidth;
-  vPos = pos;
-}

shader/dualTwoD/basic.vert

@@ -1,11 +0,0 @@
-#version 450 core
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec4 col;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 vCol;
-out vec3 vPos;
-void main() {
-  gl_Position = theMat * vec4(pos,1);
-  vCol = col;
-  vPos = pos;
-}

shader/dualTwoD/basicTweakZ.frag

@@ -1,9 +0,0 @@
-#version 450 core
-layout (location=0) out vec4 fCol;
-layout (location=1) out vec4 fPos;
-in vec4 vCol;
-in vec3 vPos;
-void main() {
-  fCol = vCol;
-  fPos = vec4(vPos,1) ;
-}

shader/dualTwoD/basicTweakZ.vert

@@ -1,14 +0,0 @@
-#version 450 core
-layout (location = 0) in vec4 position;
-layout (location = 1) in vec4 color;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 vCol;
-out vec3 vPos;
-void main()
-{
-  vec4 posxy = theMat * vec4(position.xyz,1);
-  vec4 posz  = theMat * vec4(position.xyw,1);
-  gl_Position = vec4(posxy.xy,posz.z,1);
-  vCol = color;
-  vPos = position.xyz;
-}

shader/dualTwoD/bezierQuad.frag

@@ -1,18 +0,0 @@
-#version 450 core
-in vec4 vColor;
-in vec2 boxOut;
-in vec2 boxIn;
-
-layout (location=0) out vec4 fCol;
-layout (location=1) out vec4 fPos;
-
-void main()
-{
-  //float d = x - y - 1 + 2* sqrt(y);
-  float d = sqrt(boxOut.x) + sqrt(boxOut.y) - 1.0;
-//  float e = sqrt(f(x,wStart)) + sqrt(f(y,wEnd)) - 1.0;
-  float e = sqrt(boxIn.x) + sqrt(boxIn.y) - 1.0;
-  if ( d < 0 || e > 0) { discard; }
-  fCol = vColor;
-  fPos = vec4(0,0,0,0) ;
-}

shader/dualTwoD/bezierQuad.geom

@@ -1,76 +0,0 @@
-#version 450 core
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 5) out;
-in vec4 vColor[];
-in vec2 vPosOff[];
-in float vRadMag[];
-out vec4 gColor;
-out float wStart;
-out float wEnd;
-out vec3 gBoundingBox;
-
-out vec2 box2 ;
-
-vec2 normV2 (vec2 v)
-{   return vec2(-v.y,v.x) ;
-}
-float lhs (vec2 da, vec2 db)
-{   return sign(dot(da, normV2(db))) ;
-}
-
-float extrapolate (vec2 inOne, vec2 inZeroA, vec2 inZeroB, vec2 xy)
-{ 
-    float det = inOne.x * (inZeroA.y - inZeroB.y)
-                + inZeroA.x * (inZeroB.y - inOne.y)
-                + inZeroB.x * (inOne.y   - inZeroA.y)
-                ;
-    float r = (inZeroA.y - inZeroB.y) ;
-    float s = (inZeroB.x - inZeroA.x) ;
-    float t = (inZeroA.x * inZeroB.y - inZeroB.x * inZeroA.y) ;
-    return r * xy.x + s * xy.y + t
-            / det ;
-}
-
-void main()
-{
-  vec3 pa = gl_in[0].gl_Position.xyz;
-  vec3 pb = gl_in[1].gl_Position.xyz;
-  vec3 pc = gl_in[2].gl_Position.xyz;
-
-  wStart = vRadMag [0];
-  wEnd   = vRadMag [2];
-
-  box2 = vec2 (1,0);
-  gBoundingBox = vec3 (0.9,0.1,0);
-  gColor = vColor[0];
-  gl_Position = vec4 (vPosOff[0] , pa.z , 1);
-  EmitVertex();
-  box2 = vec2 (0,1);
-  gBoundingBox = vec3 (0.1,0.9,0);
-  gColor = vColor[2];
-  gl_Position = vec4 (vPosOff[2] , pc.z , 1);
-  EmitVertex();
-  box2 = vec2( extrapolate(vPosOff[0],vPosOff[2],pb.xy,pa.xy)
-             , extrapolate(vPosOff[2],vPosOff[0],pb.xy,pa.xy)
-             ) ;
-  box2 = vec2(0.2,0);
-  gBoundingBox = vec3 (1,0,1);
-  gColor = vColor[0];
-  gl_Position = vec4 (pa, 1);
-  EmitVertex();
-  box2 = vec2( extrapolate(vPosOff[0],vPosOff[2],pb.xy,pc.xy)
-             , extrapolate(vPosOff[2],vPosOff[0],pb.xy,pc.xy)
-             ) ;
-  box2 = vec2(0,0.2);
-  gBoundingBox = vec3 (0,1,1);
-  gColor = vColor[2];
-  gl_Position = vec4 (pc, 1);
-  EmitVertex();
-  box2 = vec2( 0,0 ) ;
-  gBoundingBox = vec3 (0,0,0);
-  gColor = vColor[1];
-  gl_Position = vec4 (pb, 1);
-  EmitVertex();
-
-  EndPrimitive();
-}

shader/dualTwoD/bezierQuad.vert

@@ -1,15 +0,0 @@
-#version 450 core
-layout (location = 0) in vec3 position;
-layout (location = 1) in vec4 color;
-layout (location = 2) in vec4 boxes;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 vColor;
-out vec2 boxOut;
-out vec2 boxIn;
-void main()
-{
-  gl_Position = theMat * vec4(position.xyz,1);
-  vColor  = color;
-  boxOut = boxes.xy ;
-  boxIn = boxes.zw ;
-}

shader/dualTwoD/character.frag

@@ -1,11 +0,0 @@
-#version 450 core
-layout (location=0) out vec4 fCol;
-layout (location=1) out vec4 fPos;
-uniform sampler2D aTexture;
-in vec4 gColor;
-in vec2 gTexCoord;
-void main()
-{
-    fCol = texture(aTexture, vec2 (gTexCoord.x * 0.0078125, gTexCoord.y)) * gColor;
-    fPos = vec4(0,0,0,0);
-}

shader/dualTwoD/character.geom

@@ -1,35 +0,0 @@
-#version 450 core
-layout (points) in;
-layout (triangle_strip, max_vertices = 4) out;
-in vec4 vColor [];
-in vec3 vTexCoord [];
-out vec4 gColor;
-out vec2 gTex;
-void main()
-{
-  vec3 cenPos = gl_in[0].gl_Position.xyz;
-  float sizex = vTexCoord[0].y;
-  float sizey = vTexCoord[0].z;
-  //float size = 0.05;
-  gColor = vColor[0];
-  float texPos = vTexCoord[0].x;
-
-  gl_Position = vec4 (cenPos.x - sizex*0.5, cenPos.y - sizey*0.5, cenPos.z , 1);
-  //gl_Position = vec4 (0, 0 , 5 , 1);
-  gTex = vec2 (texPos*0.0078125, 1);
-  EmitVertex();
-  gl_Position = vec4 (cenPos.x - sizex*0.5, cenPos.y + sizey*0.5, cenPos.z , 1);
-  //gl_Position = vec4 (0, 0.5 , 5 , 1);
-  gTex = vec2 (texPos*0.0078125, 0);
-  EmitVertex();
-  gl_Position = vec4 (cenPos.x + sizex*0.5, cenPos.y - sizey*0.5, cenPos.z , 1);
-  //gl_Position = vec4 (0.5, 0.5 , -5 , 1);
-  gTex = vec2 ((texPos+1)*0.0078125, 1);
-  EmitVertex();
-  gl_Position = vec4 (cenPos.x + sizex*0.5, cenPos.y + sizey*0.5, cenPos.z , 1);
-  gTex = vec2 ((texPos+1)*0.0078125, 0);
-  //gl_Position = vec4 (0.5, 0 , -5 , 1);
-  EmitVertex();
-
-  EndPrimitive();
-}

shader/dualTwoD/character.vert

@@ -1,13 +0,0 @@
-#version 450 core
-layout (location = 0) in vec3 aPos;
-layout (location = 1) in vec4 aColor;
-layout (location = 2) in vec2 aTexCoord;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 gColor;
-out vec2 gTexCoord;
-void main()
-{
-    gl_Position = theMat * vec4(aPos, 1.0);
-    gColor = aColor;
-    gTexCoord = aTexCoord;
-}

shader/dualTwoD/ellipse.geom

@@ -1,40 +0,0 @@
-#version 450 core
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 4) out;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-in vec4 vCol[];
-out vec4 gColC; // center color
-out vec4 gColE; // edge color
-out vec2 gBoundingBox;
-out vec3 gPos;
-
-void main()
-{
-  vec4 pat = gl_in[0].gl_Position;
-  vec4 pbt = gl_in[1].gl_Position;
-  vec4 pct = gl_in[2].gl_Position;
-  vec4 pa = theMat * pat;
-  vec4 pb = theMat * pbt;
-  vec4 pc = theMat * pct;
-  gColC = vCol[0];
-  gColE = vCol[1];
-
-  gBoundingBox = vec2 (-1,1);
-  gl_Position = pb;
-  gPos = pbt.xyz;
-  EmitVertex();
-  gBoundingBox = vec2 (1,1);
-  gl_Position = pa;
-  gPos = pat.xyz;
-  EmitVertex();
-  gBoundingBox = vec2 (-1,-1);
-  gl_Position = pc;
-  gPos = pct.xyz;
-  EmitVertex();
-  gBoundingBox = vec2 (1,-1);
-  gl_Position = pa + pc - pb;
-  gPos = pat.xyz + pct.xyz - pbt.xyz;
-  EmitVertex();
-
-  EndPrimitive();
-}

shader/dualTwoD/ellipse.vert

@@ -1,11 +0,0 @@
-#version 450 core
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec4 col;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out vec4 vCol;
-void main()
-{
-  //gl_Position = theMat * vec4(pos,1);
-  gl_Position = vec4(pos,1);
-  vCol = col;
-}

shader/floor/arrayPos.frag

@@ -2,9 +2,8 @@
 in vec4 vTexPosRot;
 in vec2 vPos;
 layout (location=0) out vec4 fCol;
-layout (location=1) out vec4 fPos;
+layout (location=1) out vec3 fPos;
 layout (location=2) out vec4 normal;
-//layout (binding=0) uniform sampler2DArray tilesetSampler;
 layout (binding=40) uniform sampler2DArray diffuseSampler;
 layout (binding=41) uniform sampler2DArray normalSampler;
 vec2 rotateV2 (float a, vec2 v)
@@ -16,8 +15,9 @@ void main()
     vec3 vTexPos = vTexPosRot.xyz;
     float rot = vTexPosRot.w;
     fCol = vec4(texture(diffuseSampler,vTexPos));
-    fPos = vec4(vPos,0,1);
+    fPos = vec3(vPos,0);
     vec4 bn = vec4(texture(normalSampler,vTexPos) - 0.5);
     vec3 nmap1 = vec3(rotateV2(rot,bn.xy), bn.z);
-    normal = vec4(-nmap1 ,0);
+    normal = vec4(-nmap1.xyz ,0);
+    //normal = vec4(0,0,-1 ,0);
 }

shader/floor/arrayPos.vert

@@ -1,12 +1,12 @@
 #version 450 core
-layout (location = 0) in vec4 posXX;
-layout (location = 1) in vec4 texPosRot;
+struct PosTexRot {vec4 posXX; vec4 texPosRot; };
 layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
+layout (std430, binding = 8) readonly buffer Data { PosTexRot data[]; };
 out vec4 vTexPosRot;
 out vec2 vPos;
 void main()
 {
-  vPos = posXX.xy;
+  vPos = data[gl_VertexID].posXX.xy;
   gl_Position = theMat * vec4(vPos,0,1.0) ;
-  vTexPosRot = texPosRot;
+  vTexPosRot = data[gl_VertexID].texPosRot;
 }

shader/fullscreen/transparencyComp.frag

@@ -0,0 +1,18 @@
+#version 450 core
+in vec2 vTexPos;
+out vec4 fColor;
+layout(binding = 0) uniform sampler2D wincol;
+layout(binding = 1) uniform sampler2D winpos;
+layout(binding = 2) uniform sampler2D cloudcol;
+layout(binding = 3) uniform sampler2D cloudpos;
+vec4 blend (vec4 src, vec4 dst) {
+    return src + (1-src.a) * dst;
+}
+void main() { 
+    //fColor = texture(t0, vTexPos) + texture(t2, vTexPos); 
+    vec4 x = texture(wincol, vTexPos);
+    float xz = texture(winpos, vTexPos).z;
+    vec4 y = texture(cloudcol, vTexPos);
+    float yz = texture(cloudpos, vTexPos).z;
+    fColor = ( xz > yz ? blend(x,y) : blend(y,x)) ;
+}

shader/fullscreen/transparencyComp.vert

@@ -0,0 +1,7 @@
+#version 450 core
+layout (std140, binding = 2) uniform PosTex { vec4 posTex[6]; };
+out vec2 vTexPos;
+void main() {
+  gl_Position = vec4(posTex[gl_VertexID].xy,0,1);
+  vTexPos = posTex[gl_VertexID].zw;
+}

shader/lighting/cap.geom

@@ -1,38 +0,0 @@
-#version 450 core
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 3) out;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-layout(location=0)uniform vec3 lightPos;
-in float drawbit[];
-// the following code is duplicated in lineShadow.geom, should not be changed on its own
-vec4 projNear (vec4 pos)
-{
-    // note we project to a specific height
-    // this is quite brittle, not ideal
-    vec3 dir = pos.xyz - lightPos ;
-    float a = (100 - pos.z) / dir.z ;
-    vec2 xy = (pos.xyz + a * dir).xy ;
-    return vec4 ( xy, 100 , 1) ;
-}
-void main()
-{
-    vec4 p0 = gl_in[0].gl_Position ;
-    vec4 p1 = gl_in[1].gl_Position ;
-    vec4 p2 = gl_in[2].gl_Position ;
-    if ( //if Light Source is below all vertices, draw cap 
-        // TODO think about when LS is beside the object
-            (drawbit[0] == 1)
-            && ( p0.z - lightPos.z > 0 )
-            && ( p1.z - lightPos.z > 0 )
-            && ( p2.z - lightPos.z > 0 )
-            )
-    {
-        // the front cap
-        vec4 v1 = vec4 (0,0,1,0) ;
-        gl_Position = theMat * projNear(p0); EmitVertex();
-        gl_Position = theMat * projNear(p2); EmitVertex();
-        gl_Position = theMat * projNear(p1); EmitVertex();
-        EndPrimitive();
-    }
-    else {}
-}

shader/lighting/cap.vert

@@ -1,11 +1,28 @@
 #version 450 core
-layout (location = 0) in vec4 position;
+struct PosColNorm { vec4 pos; vec4 dummy; };
 layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-uniform vec3 lightPos;
-uniform vec4 lumRad;
-out float drawbit;
-void main()
+layout (std140, binding = 1) uniform TheLight { vec4 lightPos; vec4 lumRad; };
+layout (std430, binding = 3) readonly buffer Data { PosColNorm data[]; };
+layout (std430, binding = 4) readonly buffer Indices { uint indices[]; };
+vec4 projNear (vec4 pos)
 {
-    gl_Position = vec4(position.xyz,1);
-    drawbit = position.w;
+    // note we project to a specific height
+    // this is quite brittle, not ideal
+    vec3 dir = pos.xyz - lightPos.xyz ;
+    float a = (100 - pos.z) / dir.z ;
+    vec2 xy = (pos.xyz + a * dir).xy ;
+    return vec4 ( xy, 100 , 1) ;
+}
+bool ztest (vec4 p) {return p.z - lightPos.z > 0;}
+void main() {
+    int j = gl_VertexID/3;
+    int i1 = j * 3;
+    vec4 po = data[indices[gl_VertexID]].pos;
+    gl_Position = (po.w == 1
+            && ztest(data[indices[i1]].pos)
+            && ztest(data[indices[i1+1]].pos)
+            && ztest(data[indices[i1+2]].pos)
+            ? theMat * projNear(po)
+            : vec4(1,1,1,0)
+            );
 }

shader/lighting/capTest.geom

@@ -1,57 +0,0 @@
-#version 450 core
-// an attempt to test whether a geometry surface occludes the camera from a
-// light source
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 4) out;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-uniform vec3 lightPos;
-uniform vec2 camPos;
-void main()
-{
-    vec3 p0 = gl_in[0].gl_Position.xyz ;
-    vec3 p1 = gl_in[1].gl_Position.xyz ;
-    vec3 p2 = gl_in[2].gl_Position.xyz ;
-    
-    // first determine intersection point (if any)
-
-    vec3 u = p1 - p0 ;
-    vec3 v = p2 - p0 ;
-    vec3 n = cross (u,v) ;
-    vec3 dir = vec3 (camPos, 100) - lightPos ;
-    vec3 w0 = p0 - lightPos ;
-    float a = dot(n, w0) ;
-    float b = dot(n,dir) ;
-    if (abs(b) < 0.00001) {}
-    else {
-        float r = a / b ;   
-        if (r < 0.0) {}
-        else {
-            vec3 ip = lightPos + r * dir ;
-            float uu, uv, vv, wu, wv, D;
-            uu = dot(u,u);
-            uv = dot(u,v);
-            vv = dot(v,v);
-            vec3 w = ip - p0;
-            wu = dot (w,u);
-            wv = dot (w,v);
-            D = uv * uv - uu * vv;
-            //get and test parametric coords
-            float s, t;
-            s = (uv * wv - vv * wu) / D;
-            if (s < 0.0 || s > 1.0) {}
-            else
-            {
-                t = (uv * wu - uu * wv) / D;
-                if (t < 0.0 || (s + t) > 1.0) {}
-                else
-                {
-                    gl_Position = vec4(-1,-1,50,1); EmitVertex();
-                    gl_Position = vec4(-1, 1,50,1); EmitVertex();
-                    gl_Position = vec4( 1,-1,50,1); EmitVertex();
-                    gl_Position = vec4( 1, 1,50,1); EmitVertex();
-                    EndPrimitive();
-                }
-            }
-        }
-    }
-}

shader/lighting/cloud.frag

@@ -0,0 +1,21 @@
+#version 450 core
+layout(early_fragment_tests) in;
+layout (std140, binding = 1) uniform TheLight { vec4 lightPos; vec4 lumRad; };
+layout (binding = 0) uniform sampler2D posTexture;
+layout (binding = 1) uniform sampler2D normals;
+in vec2 vTexPos;
+out vec4 fColor;
+float rad = lumRad.a;
+void main() {
+  vec3 pos = texture(posTexture, vTexPos).xyz;
+  vec3 distVec = pos - lightPos.xyz;
+  float dist = dot(distVec, distVec);
+  vec3 norm = texture(normals, vTexPos).xyz;
+  float y1 = dot(norm, distVec);
+  float y2 = float(y1 > 0 ? 1 : 0.2);
+  //bool t = pos.z > lightPos.z && norm.z > 0;
+  //float y2 = float(y1 > 0 || t ? 1 : 0.1);
+  float x = 1 - (pow(dist / rad,4));
+  vec3 c = y2* x * lumRad.rgb;
+  fColor = vec4(c, 0);
+}

shader/lighting/cloud.vert

@@ -0,0 +1,8 @@
+#version 450 core
+layout (std140, binding = 2) uniform PosTex { vec4 posTex[6]; };
+out vec2 vTexPos;
+void main()
+{
+  gl_Position = vec4(posTex[gl_VertexID].xy,0,1);
+  vTexPos = posTex[gl_VertexID].zw;
+}

shader/lighting/floor.geom

@@ -1,27 +0,0 @@
-#version 450 core
-layout (points) in;
-layout (triangle_strip, max_vertices = 4) out;
-layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
-out float lum;
-out vec2 dField;
-void main()
-{
-  lum = gl_in[0].gl_Position.w;
-  vec4 cenPos = vec4( gl_in[0].gl_Position.xy, 0.1 , 1);
-  float gRad = gl_in[0].gl_Position.z;
-
-  dField = vec2 ( 1, 1);
-  gl_Position = theMat * vec4 (cenPos.x + gRad, cenPos.y + gRad, 0.1 , 1);
-  EmitVertex();
-  dField = vec2 (-1, 1);
-  gl_Position = theMat * vec4 (cenPos.x - gRad, cenPos.y + gRad, 0.1 , 1);
-  EmitVertex();
-  dField = vec2 ( 1,-1);
-  gl_Position = theMat * vec4 (cenPos.x + gRad, cenPos.y - gRad, 0.1 , 1);
-  EmitVertex();
-  dField = vec2 (-1,-1);
-  gl_Position = theMat * vec4 (cenPos.x - gRad, cenPos.y - gRad, 0.1 , 1);
-  EmitVertex();
-
-  EndPrimitive();
-}

shader/lighting/lineShadow.geom

@@ -1,91 +0,0 @@
-#version 450 core
-layout(lines_adjacency) in;
-layout(triangle_strip, max_vertices = 4) out;
-layout(std140, binding = 0) uniform TheMat { mat4 theMat; };
-layout(location=0) uniform vec3 lightPos;
-layout(location=1) uniform float radiusUniform;
-// vec4 shift (vec4 p) { return (vec4 (p.xyz +
-// (lumRad.a*normalize(p.xyz-lightPos)), 1));}
-float closestPointOnLineParam3 (vec3 a, vec3 b, vec3 p) {
-  return dot(p - a,b-a) / dot(b-a,b-a);
-}
-vec3 closestPointOnSeg3 (vec3 a,vec3 b, vec3 p) {
-  float x = closestPointOnLineParam3(a,b,p);
-  if (x < 0) {
-      return a;
-  } else{ if (x > 1) { return b; }
-      { return a + (x * (b- a));}
-  }
-}
-//vec3 closepoint = 
-vec4 shift(vec4 p) { return (vec4(p.xyz + (100000 * (p.xyz - lightPos)), 1)); }
-vec4 shiftBy(float x, vec4 p) {
-  return (vec4(lightPos + (x * normalize(p.xyz - lightPos)), 1));
-}
-// vec4 shift (vec4 p) { return (vec4 (lightPos +
-// (lumRad.a*normalize(p.xyz-lightPos)), 1));}
-// copied from lighting/cap.geom, should not be changed on its own
-vec4 projNear(vec4 pos) {
-  // note we project to a specific height
-  // this is quite brittle, not ideal
-  vec3 dir = pos.xyz - lightPos;
-  float a = (100 - pos.z) / dir.z;
-  vec2 xy = (pos.xyz + a * dir).xy;
-  return vec4(xy, 100, 1);
-}
-vec4 shiftNear(vec4 pos)
-//{ vec4 sp = shiftBy(radiusUniform,pos);
-{
-  vec4 sp = shift(pos);
-  if (sp.z > 100) {
-    return projNear(pos);
-  } else {
-    return sp;
-  }
-}
-vec4 f(vec4 p) { return (theMat * p); }
-void main() {
-vec4 p0 = gl_in[0].gl_Position;
-vec4 p1 = gl_in[1].gl_Position;
-vec3 closepoint = closestPointOnSeg3(p0.xyz,p1.xyz,lightPos);
-  float ru2 = radiusUniform * radiusUniform;
-  vec4 mid = 0.5 * (p0 + p1);
-  vec3 n0a = gl_in[2].gl_Position.xyz;
-  vec3 n1a = gl_in[3].gl_Position.xyz;
-  vec3 n0 = cross(p1.xyz - p0.xyz, n0a - p0.xyz);
-  vec3 n1 = cross(p0.xyz - p1.xyz, n1a - p1.xyz);
-
-  // vec3 n2 = n0 + n1; // assumes the summands are normalized
-  vec3 lightDir = p0.xyz - lightPos.xyz;
-  vec3 lightDir2 = p1.xyz - lightPos.xyz;
-  // first test if the edge is part of the silhouette
-  // that is, if the normals of the faces connected by the edge point are in
-  // "different directions" wrt the light direction
-  if (dot(n0, lightDir) * dot(n1, lightDir) <= 0 &&
-      (dot(lightDir, lightDir) < ru2 || dot(lightDir2, lightDir2) < ru2))
-  // using <= rather than < seems to get rid of overlapping shadow
-  // artefacts
-  {
-    //vec4 p2 = shiftNear(p0);
-    //vec4 p3 = shiftNear(p1);
-    vec4 p2 = shiftNear(p0);
-    vec4 p3 = shiftNear(p1);
-    gl_Position = f(p0);
-    EmitVertex();
-    if (dot(n0, lightDir) > 0) {
-      gl_Position = f(p2);
-      EmitVertex();
-      gl_Position = f(p1);
-      EmitVertex();
-    } else {
-      gl_Position = f(p1);
-      EmitVertex();
-      gl_Position = f(p2);
-      EmitVertex();
-    }
-    gl_Position = f(p3);
-    EmitVertex();
-    EndPrimitive();
-  } else {
-  }
-}

shader/lighting/lineShadow.vert

@@ -1,6 +1,83 @@
 #version 450 core
-layout (location = 0) in vec3 pos;
+struct PosColNorm { vec4 pos; vec4 dummy; };
+layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
+layout (std140, binding = 1) uniform TheLight { vec4 lightPos; vec4 colrad; };
+layout (std430, binding = 3) readonly buffer Data { PosColNorm data[]; };
+layout (std430, binding = 5) readonly buffer Indices { uint indices[]; };
+float closestPointOnLineParam3 (vec3 a, vec3 b, vec3 p) {
+  return dot(p - a,b-a) / dot(b-a,b-a);
+}
+vec3 closestPointOnSeg3 (vec3 a,vec3 b, vec3 p) {
+  float x = closestPointOnLineParam3(a,b,p);
+  return (x < 0
+        ? a
+        : (x > 1 
+            ? b
+            : a + (x * (b- a)))) ; 
+}
+vec4 shift(vec4 p) { return (vec4(p.xyz + (10000 * (p.xyz - lightPos.xyz)), 1)); }
+vec4 shiftBy(float x, vec4 p) {
+  return (vec4(lightPos.xyz + (x * normalize(p.xyz - lightPos.xyz)), 1));
+}
+vec4 projNear (vec4 pos)
+{
+    // note we project to a specific height
+    // this is quite brittle, not ideal
+    vec3 dir = pos.xyz - lightPos.xyz ;
+    float a = (100 - pos.z) / dir.z ;
+    vec2 xy = (pos.xyz + a * dir).xy ;
+    return vec4 ( xy, 100 , 1) ;
+}
+vec4 shiftNear(vec4 pos)
+{
+  vec4 sp = shift(pos);
+  return (sp.z > 100 ? projNear(pos) : sp);
+}               
+// Output 6 vertices for 4 data inputs
+const int ks[6] = //        Inputdata:  n1a   Shadow:
+    {0,1,2  //  2--3              /       p2--p3
+    ,2,1,3  //  |  |       p0---p1        /    |
+    };      //  0--1      /              /     |
+            //          n0a             p0----p1
 void main()
 {
-    gl_Position = vec4(pos,1);
+    int k = ks[gl_VertexID % 6]; 
+    int i0 = 4*(gl_VertexID / 6);
+    vec4 p0 = data[indices[i0]].pos;
+    vec4 p1 = data[indices[i0+1]].pos;
+    vec3 n0a = data[indices[i0+2]].pos.xyz;
+    vec3 n1a = data[indices[i0+3]].pos.xyz;
+    vec3 closepoint = closestPointOnSeg3(p0.xyz,p1.xyz,lightPos.xyz);
+    float ru2 = colrad.w * colrad.w;
+    vec4 mid = 0.5 * (p0 + p1);
+    vec3 n0 = cross(p1.xyz - p0.xyz, n0a - p0.xyz);
+    vec3 n1 = cross(p0.xyz - p1.xyz, n1a - p1.xyz);
+    vec3 lightDir = p0.xyz - lightPos.xyz;
+    vec3 lightDir2 = p1.xyz - lightPos.xyz;
+  // test if the edge is part of the silhouette
+  // that is, if the normals of the faces connected to the edge are in
+  // "different directions" wrt the light direction
+  // (first test the "drawbit")
+  //if (p0.w==1 && dot(n0, lightDir) * dot(n1, lightDir) <= 0 &&
+  if ( dot(n0, lightDir) * dot(n1, lightDir) <= 0 &&
+      (dot(lightDir, lightDir) < ru2 || dot(lightDir2, lightDir2) < ru2))
+  // using <= rather than < seems to get rid of overlapping shadow
+  // artefacts
+  { 
+    vec4 p2 = shiftNear(p0);
+    vec4 p3 = shiftNear(p1);
+    if (dot(n0, lightDir) < 0) 
+        {
+            vec4 sp[4] = {p1,p0,p3,p2};
+            gl_Position = theMat * sp[k];}
+    else {
+            vec4 ps[4] = {p0,p1,p2,p3};
+            gl_Position = theMat * ps[k]; }
+  }
+  else {gl_Position = vec4(1,1,1,0);}
 }
+//layout (location = 0) in vec3 pos;
+//void main()
+//{
+//    gl_Position = vec4(pos,1);
+//}

shader/lighting/texture.frag

@@ -1,34 +1,35 @@
 #version 450 core
-layout(location=0)uniform vec3 lightPos;
-layout(location=1)uniform vec4 lumRad;
-layout (binding = 0) uniform sampler2D screenTexture;
+layout(early_fragment_tests) in;
+layout (std140, binding = 1) uniform TheLight { vec4 lightPos; vec4 lumRad; };
+layout (binding = 0) uniform sampler2D posTexture;
 layout (binding = 1) uniform sampler2D normals;
 in vec2 vTexPos;
 out vec4 fColor;
 float rad = lumRad.a;
 void main() {
-  vec3 pos = texture(screenTexture, vTexPos).xyz;
-  vec3 distVec = pos - lightPos;
+  vec3 pos = texture(posTexture, vTexPos).xyz;
+  vec3 distVec = pos - lightPos.xyz;
   float dist = dot(distVec, distVec);
-  if (dist > rad) {
-    discard;
-  }
-  vec4 normbit = texture(normals, vTexPos);
-  vec3 norm = normbit.xyz;
+//  float dist = dot(distVec.xy, distVec.xy);
+//  if (dist > rad) {
+//    discard;
+//  }
+  float t = texture(normals, vTexPos).w;
+  vec3 norm = texture(normals, vTexPos).xyz;
   float y1 = dot(normalize(norm), normalize(distVec));
   float y2 = float(y1 > 0 ? 1 : 0);
-  //float y3 = clamp(0.5 * (y1 + 1),0,1) ;
-  float y3 = clamp(2*y1 + 1,0,1) ;
-  //float y3 = clamp(0.5 * (y1 + 2),0,1) ;
-  //float y = float(normbit.w == 0 ? y3 : y2);
-  float y = y2;
-  //float x = 1 - dist / rad;
-  float x = 1 - (pow(dist / rad,4));
-  //float x = 1 ;
+  //float y2x = y2;
+  float y4 = float(y1 > 0 && y1 < 0.5 ? 0.5 : y2);
+  float y5 = max(0,y1);
+  //float y4 = smoothstep(-1,1,y1);
+  //float y4 = 0.25*pow(y1+1,2);
+  float y3 = float(t > 0 
+        ? y2 
+        : (t == 0 ? y4 : y4));
+  //float x = 1 - (dist / rad);
   //float x = 1;
-  //float x = 1 - max(0, ((dist + 10000) - rad) * 0.0001) ;
-  //vec3 c = y* (x * x * x) * lumRad.rgb;
-  vec3 c = y* x * lumRad.rgb;
-  //vec3 c =  x * lumRad.rgb;
+  //float x = (dist > rad ? 0 : 1);
+  float x = 1 - (pow(dist / rad,4));
+  vec3 c = y3* x * lumRad.rgb;
   fColor = vec4(c, 0);
 }

shader/lighting/texture.vert

@@ -1,9 +1,8 @@
 #version 450 core
-layout (location = 0) in vec2 pos;
-layout (location = 1) in vec2 texPos;
+layout (std140, binding = 2) uniform PosTex { vec4 posTex[6]; };
 out vec2 vTexPos;
 void main()
 {
-  gl_Position = vec4(pos,0,1);
-  vTexPos = texPos;
+  gl_Position = vec4(posTex[gl_VertexID].xy,0,1);
+  vTexPos = posTex[gl_VertexID].zw;
 }