dany/Diya-API
1
0
Fork 0
mirror of https://github.com/lxsang/Diya-API.git synced 2025-03-12 18:42:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from lxsang/conflict

Browse Source 
fix conflict
This commit is contained in:
Dany LE 2022-03-16 21:36:26 +01:00 committed by GitHub
commit f215eb054f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 83 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Diya/DiyaBoot.class.st
View File

@ -75,8 +75,8 @@ DiyaBoot >> createWindow [
{ #category : #events } { #category : #events }
DiyaBoot >> exampleNodes [ DiyaBoot >> exampleNodes [
|root node style tex| |root node style tex|
tex := (DiyaImageTex fromFile:Smalltalk imageDirectory / 'assets'/'mrsang.png').
root := DiyaRootNode new. root := DiyaRootNode new.
tex := (DiyaImageTex fromFile:Smalltalk imageDirectory / 'assets'/'mrsang.png').
node := root addNode: (DiyaRectangle size: 200@200) at: 250 @ 430. node := root addNode: (DiyaRectangle size: 200@200) at: 250 @ 430.
node texture: tex. node texture: tex.
node color: (Color r: 1.0 g:1.0 b:1.0 alpha:1.0 ). node color: (Color r: 1.0 g:1.0 b:1.0 alpha:1.0 ).
@ -96,7 +96,7 @@ DiyaBoot >> exampleNodes [
node scale: 1.5@1.5. node scale: 1.5@1.5.
node := root addNode: (DiyaText data: String loremIpsum) at: 10@340. node := root addNode: (DiyaText data: String loremIpsum) at: 10@340.
node extent: 230@320. node extent: 250@320.
node wordWrap: true. node wordWrap: true.
node := root addNode: (DiyaLine from: 10@620 to: 200@635). node := root addNode: (DiyaLine from: 10@620 to: 200@635).
@ -109,7 +109,7 @@ DiyaBoot >> exampleNodes [
node color: Color white. node color: Color white.
node borderWidth: 3.0. node borderWidth: 3.0.
node texture: tex. node texture: tex.
"node rotation:(Float pi / 4.0)."
node := root addNode: (DiyaConvexPolygon points:{250@100. 400@250. 450@80. 350@60}). node := root addNode: (DiyaConvexPolygon points:{250@100. 400@250. 450@80. 350@60}).
node color: Color green. node color: Color green.
@ -166,24 +166,20 @@ DiyaBoot >> randomColorChannel [
{ #category : #events } { #category : #events }
DiyaBoot >> render [ DiyaBoot >> render [
|event root text delta fps maxfps minfps| |event root text delta fps|
event := SDL_Event new. event := SDL_Event new.
root := self exampleNodes. root := self exampleNodes.
DiyaRenderer uniqueInstance root: root. DiyaRenderer uniqueInstance root: root.
text := root addNode:(DiyaText data: 'tick') at: (display w - 250)@40. text := root addNode:(DiyaText data: 'tick') at: (display w - 80)@40.
text extent: 250@40. text extent: 80@40.
text fontSize: 20. text fontSize: 18.
text color: Color red. text color: Color red.
DiyaRendererContext uniqueInstance. DiyaRendererContext uniqueInstance.
self GLinit. self GLinit.
fps := maxfps := 0.
minfps := self class maxFPS.
[ running ] whileTrue: [ [ running ] whileTrue: [
delta := DiyaClock uniqueInstance delta asMilliSeconds. delta := DiyaClock uniqueInstance delta asMilliSeconds.
fps := ((1000/delta) asInteger). fps := ((1000/delta) asInteger).
maxfps := maxfps max: fps. text data: ('FPS:', fps asString).
minfps := minfps min: fps.
text data: ('FPS:', fps asString, '(Min ', minfps asString, ', max ', maxfps asString, ')').
DiyaClock uniqueInstance tick. DiyaClock uniqueInstance tick.
[(SDL2 pollEvent: event) > 0] whileTrue: [ [(SDL2 pollEvent: event) > 0] whileTrue: [
self processEvent: event self processEvent: event
@ -192,7 +188,7 @@ DiyaBoot >> render [
SDL2 glSwapWindow: window. SDL2 glSwapWindow: window.
delta := DiyaClock uniqueInstance delta asMilliSeconds. delta := DiyaClock uniqueInstance delta asMilliSeconds.
SDL2 delay: (0 max: (1000/ self class maxFPS) asInteger - delta). "60 fps" SDL2 delay: (0 max: (1000/ self class maxFPS) asInteger - delta).
]. ].
] ]

2
Diya/DiyaText.class.st
View File

@ -114,7 +114,7 @@ DiyaText >> getCharsVerticesAt:i offset: offset on: tex2D [
c = (Character space asciiValue) ifTrue:[ c = (Character space asciiValue) ifTrue:[
offset setX: (offset x + (tex2D spacing ) ) setY: offset y. offset setX: (offset x + (tex2D spacing ) ) setY: offset y.
wrap ifTrue: [ wrap ifTrue: [
(offset x + ((self nextSpaceFrom: i + 1) * (tex2D spacing))) > (self extent x) ifTrue: [ (offset x + ((self nextSpaceFrom: i + 1) * (tex2D fontSize))) > (self extent x) ifTrue: [
offset setX: 0.0 setY: (offset y )- (tex2D linespace)]. offset setX: 0.0 setY: (offset y )- (tex2D linespace)].
]. ].
^ {}. ^ {}.

11
Diya/FT2Face.extension.st Normal file
View File

@ -0,0 +1,11 @@
Extension { #name : #FT2Face }
{ #category : #'*Diya' }
FT2Face >> getFirstChar: gindex [
^self ffiCall: #(FT_ULong FT_Get_First_Char(self,FT_UInt *gindex)).
]
{ #category : #'*Diya' }
FT2Face >> getNextChar: charcode iptr: gindex [
^self ffiCall: #( FT_ULong FT_Get_Next_Char(self,FT_ULong charcode,FT_UInt *gindex )).
]

91
Diya/OpenGLFontTex.class.st
View File

@ -5,7 +5,8 @@ Class {
'charmap', 'charmap',
'cellw', 'cellw',
'cellh', 'cellh',
'spacing' 'spacing',
'fontSize'
], ],
#pools : [ #pools : [
'OpenGLConstants', 'OpenGLConstants',
@ -24,7 +25,8 @@ OpenGLFontTex >> blitPixel8: bitmap at: offset size: size [
size = (0@0) ifTrue:[^self]. size = (0@0) ifTrue:[^self].
0 to: size y - 1 do: [ :i| 0 to: size y - 1 do: [ :i|
LibC memCopy: (bitmap getHandle + (i* (size x))) to:(data getHandle + ((i + offset y) * width + (offset x) )) size: size x LibC memCopy: (bitmap getHandle + (i* (size x))) to:(data getHandle + ((i + offset y) * width + (offset x) )) size: size x
] ].
bitmap free.
] ]
{ #category : #accessing } { #category : #accessing }
@ -43,28 +45,34 @@ OpenGLFontTex >> charmap [
] ]
{ #category : #'instance creation' } { #category : #'instance creation' }
OpenGLFontTex >> createBitmapFontFrom: bitmaps metrics: metrics maxBearing: maxbearing [ OpenGLFontTex >> createBitmapFontFrom: glyphs maxBearing: maxbearing [
|currChar offset| |bmp metric offset nrows index element|
data ifNotNil: [data free ]. data ifNotNil: [data free ].
charmap := OrderedCollection new. charmap := Dictionary new.
data := FFIExternalArray externalNewType: GLubyte size:cellw * cellh * 256. nrows := glyphs size >> 5.
(glyphs size % 32) = 0 ifFalse:[nrows := nrows + 1].
data := FFIExternalArray externalNewType: GLubyte size:cellw * cellh * (nrows << 5).
LibC memset: data getHandle value: 0 size: data size. LibC memset: data getHandle value: 0 size: data size.
data autoRelease. data autoRelease.
currChar := 1. index := 1.
offset := 0@0. offset := 0@0.
width := cellw * 16. width := cellw * 32.
height := cellh * 16. height := cellh * nrows.
0 to: 15 do: [ :row| 0 to: nrows - 1 do: [ :row|
0 to: 15 do: [ :col| |glyph| 0 to: 31 do: [ :col| |glyph|
element := glyphs at: index.
metric := element at: 3.
bmp := element at:2.
offset := (col * cellw) @ (row*cellh). offset := (col * cellw) @ (row*cellh).
glyph := (DiyaFontGlyph origin: offset extent: (((metrics at: currChar) first x asInteger) @ cellh)). glyph := (DiyaFontGlyph origin: offset extent: ((metric first x asInteger) @ cellh)).
glyph glyph
bearing: ((metrics at: currChar) at: 2) asFloatPoint; bearing: (metric at: 2) asFloatPoint;
advance: ((metrics at: currChar) at: 3) asFloatPoint; advance: (metric at: 3) asFloatPoint;
texcoord: (Rectangle origin: (glyph origin/ (self extent) ) asFloatPoint corner: ((glyph corner) / (self extent)) asFloatPoint ). texcoord: (Rectangle origin: (glyph origin/ (self extent) ) asFloatPoint corner: ((glyph corner) / (self extent)) asFloatPoint ).
charmap add:glyph. charmap at: element first put:glyph.
self blitPixel8: (bitmaps at: currChar) at: (offset x) @ ((offset y) + maxbearing - ((metrics at: currChar) last) ) size: (metrics at: currChar) first. self blitPixel8: bmp at: (offset x) @ ((offset y) + maxbearing - (metric last) ) size: metric first.
currChar := currChar + 1. index := index + 1.
index > glyphs size ifTrue:[^self].
] ]
]. ].
] ]
@ -77,51 +85,62 @@ OpenGLFontTex >> drop [
disable: GL_BLEND. disable: GL_BLEND.
] ]
{ #category : #accessing }
OpenGLFontTex >> fontSize [
^ fontSize
]
{ #category : #'instance creation' } { #category : #'instance creation' }
OpenGLFontTex >> fromFace: face ofSize: size [ OpenGLFontTex >> fromFace: face ofSize: size [
|minhang maxbearing rec metrics bitmaps | |minhang maxbearing rec glyphs iptr charcode w|
fontSize := size.
face setPixelWidth:0 height: size. face setPixelWidth:0 height: size.
"set up a buffer for 256 characters" glyphs := OrderedCollection new.
bitmaps := OrderedCollection new.
metrics := OrderedCollection new.
cellw := 0. cellw := 0.
cellh := 0. cellh := 0.
minhang := 0. minhang := 0.
maxbearing := 0. maxbearing := 0.
iptr := FFIExternalArray externalNewType: GLuint size:1.
iptr at:1 put: 0.
rec := (FTFaceRec fromHandle: face getHandle). rec := (FTFaceRec fromHandle: face getHandle).
0 to: 255 do: [ :c | charcode := face getFirstChar: iptr getHandle.
|bmp bmpsize| [ (iptr at: 1) = 0 ] whileFalse: [
face loadCharacter: c flags: (1 << 2). |bmp bmpsize metric|
metrics add: { face loadCharacter: charcode flags: (1 << 2).
(((rec glyph metrics width) /64)@ ((rec glyph metrics height) /64)). w := ((rec glyph metrics width) >> 6).
(w > (size << 1)) ifFalse:[
metric := {
(((rec glyph metrics width) >> 6)@ ((rec glyph metrics height) >> 6)).
(face glyph hBearing). (face glyph hBearing).
(face glyph advance). (face glyph advance).
((rec glyph metrics horiBearingY) / 64) ((rec glyph metrics horiBearingY) >> 6)
}. }.
maxbearing := maxbearing max: ((rec glyph metrics horiBearingY) / 64). maxbearing := maxbearing max: ((rec glyph metrics horiBearingY) >> 6).
cellw := cellw max: ((rec glyph metrics width) / 64). cellw := cellw max: w.
minhang := minhang min: ((( rec glyph metrics horiBearingY) - (rec glyph metrics height )) / 64). minhang := minhang min: ((( rec glyph metrics horiBearingY) - (rec glyph metrics height)) >> 6).
"copy buffer" "copy buffer"
bmpsize := (rec glyph bitmap width)*(rec glyph bitmap rows). bmpsize := (rec glyph bitmap width)*(rec glyph bitmap rows).
bmp := FFIExternalArray externalNewType: GLubyte size:bmpsize. bmp := FFIExternalArray externalNewType: GLubyte size:bmpsize.
LibC memCopy: rec glyph bitmap buffer to: bmp getHandle size: bmpsize. LibC memCopy: rec glyph bitmap buffer to: bmp getHandle size: bmpsize.
bitmaps add: bmp. glyphs add: {charcode. bmp. metric}.
].
charcode := face getNextChar: charcode iptr: iptr getHandle.
]. ].
cellh := maxbearing - minhang. cellh := maxbearing - minhang.
spacing := (cellw / 2) asInteger. spacing := (size >> 2) asInteger.
self createBitmapFontFrom: bitmaps metrics: metrics maxBearing: maxbearing. self createBitmapFontFrom: glyphs maxBearing: maxbearing.
bitmaps do:[:p| p free]. iptr free.
] ]
{ #category : #accessing } { #category : #accessing }
OpenGLFontTex >> getGlyph: c [ OpenGLFontTex >> getGlyph: c [
^(self charmap at: c + 1) ^(self charmap at: c ifAbsent:[^nil])
] ]
{ #category : #initialization } { #category : #initialization }
OpenGLFontTex >> initialize [ OpenGLFontTex >> initialize [
super initialize. super initialize.
charmap := OrderedCollection new. charmap := Dictionary new.
data := nil. data := nil.
level := 0. level := 0.
border := 0. border := 0.