Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added gl-slideshow.fs link to gles2 directory |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6785b2f71587a2dc8b08bda747080376 |
User & Date: | bernd 2014-07-01 23:49:53.128 |
Context
2014-08-15
| ||
00:11 | 32 bit problem with glGetShaderInfoLog fixed Leaf check-in: c7ea2c6286 user: bernd tags: trunk | |
2014-07-01
| ||
23:49 | Added gl-slideshow.fs link to gles2 directory check-in: 6785b2f715 user: bernd tags: trunk | |
22:58 | More version depending stuff, color done right check-in: 378ea8426f user: bernd tags: trunk | |
Changes
Changes to gl-terminal.fs.
︙ | ︙ | |||
350 351 352 353 354 355 356 | unit-matrix MVPMatrix set-matrix ; :noname defers window-init term-init config-changer ; IS window-init window-init previous previous \ remove opengl from search order | > > > > > > > | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | unit-matrix MVPMatrix set-matrix ; :noname defers window-init term-init config-changer ; IS window-init window-init previous previous \ remove opengl from search order \ android version for system : system ( addr u -- ) r/o open-pipe throw 0 { fd w^ string } fd string $[]slurp string $[]. string $[]off ; : sh '#' parse cr system ; |
Added gles2/gl-slideshow.fs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | \ Open GL slide show demo require gl-helper.fs require jpeg-exif.fs also [IFDEF] android android [THEN] also opengl \ six slides in memory, cyclic wraparound tex: slide0 tex: slide1 tex: slide2 tex: slide3 tex: slide4 tex: slide5 6 Constant slide# 20 Constant thumbs# : slides: Create DOES> ( n -- addr ) swap slide# mod cells + ; : thumbs: Create DOES> ( n -- addr ) swap thumbs# mod cells + ; slides: slides ' slide0 , ' slide1 , ' slide2 , ' slide3 , ' slide4 , ' slide5 , slides: slidex -1 , -1 , -1 , -1 , -1 , -1 , slides: slidewh -1 , -1 , -1 , -1 , -1 , -1 , \ 20 thumbs in memory, cyclic wraparound tex: thumb00 tex: thumb01 tex: thumb02 tex: thumb03 tex: thumb04 tex: thumb05 tex: thumb06 tex: thumb07 tex: thumb08 tex: thumb09 tex: thumb10 tex: thumb11 tex: thumb12 tex: thumb13 tex: thumb14 tex: thumb15 tex: thumb16 tex: thumb17 tex: thumb18 tex: thumb19 thumbs: thumbs ' thumb00 , ' thumb01 , ' thumb02 , ' thumb03 , ' thumb04 , ' thumb05 , ' thumb06 , ' thumb07 , ' thumb08 , ' thumb09 , ' thumb10 , ' thumb11 , ' thumb12 , ' thumb13 , ' thumb14 , ' thumb15 , ' thumb16 , ' thumb17 , ' thumb18 , ' thumb19 , thumbs: thumbx -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , thumbs: thumbwh -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , -1 , Variable slidelist : read-in ( n -- ) >r r@ dup slidex @ <> IF r@ slides perform r@ dup slidex ! r@ slidelist $[]@ load-texture $10 lshift or r> slidewh ! ELSE r> slides perform THEN ; : read-thumb-in ( n -- ) >r r@ dup thumbx @ <> IF r@ thumbs perform r@ dup thumbx ! r@ slidelist $[]@ load-thumb $10 lshift or r> thumbwh ! ELSE r> thumbs perform THEN ; $FFFFFFFF Value slcolor Variable xoff Variable yoff : sl-rectangle { f: x1 f: y1 f: x2 f: y2 -- } v0 i0 >v x1 xoff sf@ f+ y2 yoff sf@ f+ >xy slcolor rgba>c n> 0e 0e >st v+ x2 xoff sf@ f+ y2 yoff sf@ f+ >xy slcolor rgba>c n> 1e 0e >st v+ x2 xoff sf@ f+ y1 yoff sf@ f+ >xy slcolor rgba>c n> 1e 1e >st v+ x1 xoff sf@ f+ y1 yoff sf@ f+ >xy slcolor rgba>c n> 0e 1e >st v+ v> 0 i, 1 i, 2 i, 0 i, 2 i, 3 i, ; : blend ( alpha -- ) $FF fm* f>s $FF and $FFFFFF00 or to slcolor ; : xshift ( delta -- ) xoff sf! ; : yshift ( delta -- ) yoff sf! ; : <draw-slide ( -- ) program init unit-matrix MVPMatrix set-matrix 0e fdup fdup 1.0e glClearColor clear Ambient 1 ambient% glUniform1fv ; : draw-slide ( n -- ) read-in -1e -1e 1e 1e sl-rectangle GL_TRIANGLES draw-elements ; 4 Constant thumb# 2e thumb# fm/ FConstant 2/x 1e thumb# fm/ 0.9e f* FConstant 1/x \ with border : draw-thumb { f: x f: y n -- } n read-thumb-in x 1/x f- y 1/x f- x 1/x f+ y 1/x f+ sl-rectangle GL_TRIANGLES draw-elements ; : draw-thumbs { n -- } thumb# 1+ 0 DO thumb# 0 DO n J thumb# * + I + dup slidelist $[]# u< IF I 2* thumb# 1- - 2/x fm* f2/ thumb# 1- J 2* - 2/x fm* f2/ draw-thumb ELSE drop THEN LOOP LOOP ; : draw-slide> ( -- ) sync ; [IFUNDEF] ftime : ftime ( -- r ) ntime d>f 1e-9 f* ; [THEN] : fade { n1 n2 f: delta-time -- } n1 n2 = ?EXIT ftime { f: startt } BEGIN ftime startt f- delta-time f/ fdup 1e f< WHILE <draw-slide 1e blend n1 draw-slide blend n2 draw-slide draw-slide> REPEAT <draw-slide 1e blend n2 draw-slide draw-slide> fdrop ; : hslide { n1 n2 f: delta-time -- } n1 n2 = ?EXIT ftime { f: startt } BEGIN ftime startt f- delta-time f/ fdup 1e f< WHILE <draw-slide pi f* fcos 1e f- [ pi f2/ fnegate ] FLiteral f* fcos 1e f- fdup n1 n2 > IF fnegate THEN xshift n1 draw-slide 2e f+ n1 n2 > IF fnegate THEN xshift n2 draw-slide draw-slide> REPEAT <draw-slide n2 draw-slide draw-slide> fdrop ; : vslide { n1 n2 f: delta-time -- } n1 n2 = ?EXIT ftime { f: startt } BEGIN ftime startt f- delta-time f/ fdup 1e f< WHILE <draw-slide pi f* fcos 1e f- [ pi f2/ fnegate ] FLiteral f* fcos 1e f- fdup n1 n2 < IF fnegate THEN yshift n1 draw-slide 2e f+ n1 n2 < IF fnegate THEN yshift n2 draw-slide draw-slide> REPEAT <draw-slide n2 draw-slide draw-slide> fdrop ; : slideshow-init ( -- ) ctx 0= IF helper-init THEN ['] VertexShader ['] FragmentShader create-program to program program init unit-matrix MVPMatrix set-matrix ; Variable current-slide : prefetch ( -- ) current-slide @ 1+ slidelist $[]# 1- min read-in current-slide @ 1- 0 max read-in ; : prefetch-thumb ( -- ) ; : +slide ( n -- n1 n2 ) current-slide @ tuck + 0 max slidelist $[]# 1- min dup current-slide ! ; : thumb-slide ( n -- ) +slide <draw-slide current-slide @ draw-thumbs draw-slide> ; : thumb-yr ( -- float ) current-slide @ thumb# / s>f y-pos sf@ f2/ thumb# fm* f+ ; : thumb-scroll ( r -- ) fdup floor fdup f>s thumb# * current-slide ! f- f2* thumb# fm/ >y-pos 0 thumb-slide ; : +thumb-slide ( delta -- ) thumb-yr f+ slidelist $[]# thumb# / 1 - s>f fmin 0e fmax thumb-scroll 2drop ; : ?esc ( -- ) key? IF key #esc = IF -1 level# +! THEN THEN ; : slide-reshow ( -- ) 0e >y-pos <draw-slide current-slide @ draw-slide draw-slide> ; : slide-input ( -- ) >looper ?esc *input >r r@ IF case r@ action @ r@ action on 1 ( AMOTION_EVENT_ACTION_UP ) of short? IF 3 3 click-regions BEGIN 2dup 1 0 d= IF 2drop -1 +slide 1e vslide LEAVE THEN 2dup 1 2 d= IF 2drop 1 +slide 1e vslide LEAVE THEN 2dup 0 1 d= IF 2drop -1 +slide 1e hslide LEAVE THEN 2dup 2 1 d= IF 2drop 1 +slide 1e hslide LEAVE THEN 2dup 1 1 d= IF 2drop 1 +slide .5e fade LEAVE THEN 2drop DONE THEN endof 0 of !click endof endcase THEN rdrop need-sync @ IF slideshow-init slide-reshow need-sync off THEN ; : (reshow) ( -- ) slide-reshow BEGIN prefetch slide-input level# @ 0= UNTIL need-sync on ; : reshow ( -- ) [IFDEF] android kbflag @ IF togglekb THEN [THEN] 1 level# +! slideshow-init (reshow) ; : up-down ( -- ) ekey? IF ekey case k-up of [ thumb# dup * negate ]L thumb-slide endof k-down of [ thumb# dup * ]L thumb-slide endof #esc of -1 level# +! endof endcase THEN ; : thumb-input ( -- ) up-down >looper *input >r r@ IF r@ action @ case 1 of short? IF thumb# dup click-regions thumb# * + current-slide +! (reshow) 1 level# +! 0 thumb-slide THEN r@ action on endof abs 1 <> IF thumb# r@ y0 @ last-y0 motion-y0 ['] +thumb-slide do-motion ELSE last-y0 motion-y0 ['] +thumb-slide drag-motion THEN 0 endcase THEN rdrop need-sync @ IF slideshow-init 0 thumb-slide need-sync off THEN ; : rethumb ( -- ) [IFDEF] android kbflag @ IF togglekb THEN [THEN] 0e >y-pos 1 level# +! slideshow-init 0 thumb-slide BEGIN prefetch-thumb thumb-input level# @ 0= UNTIL need-sync on ; : slide-show ( addr u -- ) slidelist $[]slurp-file current-slide off reshow ; : thumb-show ( addr u -- ) slidelist $[]slurp-file current-slide off rethumb ; previous previous \ s" slide.lst" slide-show |
Changes to gles2/gl-terminal.fs.
︙ | ︙ | |||
350 351 352 353 354 355 356 | unit-matrix MVPMatrix set-matrix ; :noname defers window-init term-init config-changer ; IS window-init window-init previous previous \ remove opengl from search order | > > > > > > > | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | unit-matrix MVPMatrix set-matrix ; :noname defers window-init term-init config-changer ; IS window-init window-init previous previous \ remove opengl from search order \ android version for system : system ( addr u -- ) r/o open-pipe throw 0 { fd w^ string } fd string $[]slurp string $[]. string $[]off ; : sh '#' parse cr system ; |