Skip to content

Commit cd692f0

Browse files
committed
Regenerate bindings
1 parent 863e660 commit cd692f0

File tree

17 files changed

+423
-410
lines changed

17 files changed

+423
-410
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ Should you encountered any installation problems, feel free to file an issue.
2727
## Quick start
2828

2929
```julia
30-
# http://transit.iut2.upmf-grenoble.fr/doc/libcsfml-doc/html/
3130
using CSFML.LibCSFML
3231

33-
mode = sfVideoMode(1250, 1250, 32)
32+
mode = sfVideoMode(1280, 720, 32)
3433

3534
window = sfRenderWindow_create(mode, "SFML window", sfResize | sfClose, C_NULL)
3635
@assert window != C_NULL

examples/short_example.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# http://transit.iut2.upmf-grenoble.fr/doc/libcsfml-doc/html/
21
using CSFML.LibCSFML
32

4-
mode = sfVideoMode(1250, 1250, 32)
3+
mode = sfVideoMode(1280, 720, 32)
54

65
window = sfRenderWindow_create(mode, "SFML window", sfResize | sfClose, C_NULL)
76
@assert window != C_NULL

gen/gen_audio.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ for trans_unit in ctx.trans_units
3939
wrap!(ctx, child)
4040
end
4141
@info "writing $(api_file)"
42-
println(api_stream, "# Julia wrapper for header: $header")
42+
println(api_stream, "# Julia wrapper for header: $(basename(header))")
4343
println(api_stream, "# Automatically generated using Clang.jl\n")
4444
print_buffer(api_stream, ctx.api_buffer)
4545
empty!(ctx.api_buffer) # clean up api_buffer for the next header

gen/gen_graphics.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ for trans_unit in ctx.trans_units
3939
wrap!(ctx, child)
4040
end
4141
@info "writing $(api_file)"
42-
println(api_stream, "# Julia wrapper for header: $header")
42+
println(api_stream, "# Julia wrapper for header: $(basename(header))")
4343
println(api_stream, "# Automatically generated using Clang.jl\n")
4444
print_buffer(api_stream, ctx.api_buffer)
4545
empty!(ctx.api_buffer) # clean up api_buffer for the next header

gen/gen_network.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ for trans_unit in ctx.trans_units
3939
wrap!(ctx, child)
4040
end
4141
@info "writing $(api_file)"
42-
println(api_stream, "# Julia wrapper for header: $header")
42+
println(api_stream, "# Julia wrapper for header: $(basename(header))")
4343
println(api_stream, "# Automatically generated using Clang.jl\n")
4444
print_buffer(api_stream, ctx.api_buffer)
4545
empty!(ctx.api_buffer) # clean up api_buffer for the next header

gen/gen_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ for trans_unit in ctx.trans_units
3939
wrap!(ctx, child)
4040
end
4141
@info "writing $(api_file)"
42-
println(api_stream, "# Julia wrapper for header: $header")
42+
println(api_stream, "# Julia wrapper for header: $(basename(header))")
4343
println(api_stream, "# Automatically generated using Clang.jl\n")
4444
print_buffer(api_stream, ctx.api_buffer)
4545
empty!(ctx.api_buffer) # clean up api_buffer for the next header

gen/gen_window.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ for trans_unit in ctx.trans_units
3939
wrap!(ctx, child)
4040
end
4141
@info "writing $(api_file)"
42-
println(api_stream, "# Julia wrapper for header: $header")
42+
println(api_stream, "# Julia wrapper for header: $(basename(header))")
4343
println(api_stream, "# Automatically generated using Clang.jl\n")
4444
print_buffer(api_stream, ctx.api_buffer)
4545
empty!(ctx.api_buffer) # clean up api_buffer for the next header

src/Audio/audio_api.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio.h
1+
# Julia wrapper for header: Audio.h
22
# Automatically generated using Clang.jl
33

4-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/Export.h
4+
# Julia wrapper for header: Export.h
55
# Automatically generated using Clang.jl
66

7-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/Listener.h
7+
# Julia wrapper for header: Listener.h
88
# Automatically generated using Clang.jl
99

1010

@@ -39,7 +39,7 @@ end
3939
function sfListener_getUpVector()
4040
ccall((:sfListener_getUpVector, libcsfml_audio), sfVector3f, ())
4141
end
42-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/Music.h
42+
# Julia wrapper for header: Music.h
4343
# Automatically generated using Clang.jl
4444

4545

@@ -158,7 +158,7 @@ end
158158
function sfMusic_getAttenuation(music)
159159
ccall((:sfMusic_getAttenuation, libcsfml_audio), Cfloat, (Ptr{sfMusic},), music)
160160
end
161-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/Sound.h
161+
# Julia wrapper for header: Sound.h
162162
# Automatically generated using Clang.jl
163163

164164

@@ -261,7 +261,7 @@ end
261261
function sfSound_getPlayingOffset(sound)
262262
ccall((:sfSound_getPlayingOffset, libcsfml_audio), sfTime, (Ptr{sfSound},), sound)
263263
end
264-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/SoundBuffer.h
264+
# Julia wrapper for header: SoundBuffer.h
265265
# Automatically generated using Clang.jl
266266

267267

@@ -312,7 +312,7 @@ end
312312
function sfSoundBuffer_getDuration(soundBuffer)
313313
ccall((:sfSoundBuffer_getDuration, libcsfml_audio), sfTime, (Ptr{sfSoundBuffer},), soundBuffer)
314314
end
315-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/SoundBufferRecorder.h
315+
# Julia wrapper for header: SoundBufferRecorder.h
316316
# Automatically generated using Clang.jl
317317

318318

@@ -347,7 +347,7 @@ end
347347
function sfSoundBufferRecorder_getDevice(soundBufferRecorder)
348348
ccall((:sfSoundBufferRecorder_getDevice, libcsfml_audio), Cstring, (Ptr{sfSoundBufferRecorder},), soundBufferRecorder)
349349
end
350-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/SoundRecorder.h
350+
# Julia wrapper for header: SoundRecorder.h
351351
# Automatically generated using Clang.jl
352352

353353

@@ -402,10 +402,10 @@ end
402402
function sfSoundRecorder_getChannelCount(soundRecorder)
403403
ccall((:sfSoundRecorder_getChannelCount, libcsfml_audio), UInt32, (Ptr{sfSoundRecorder},), soundRecorder)
404404
end
405-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/SoundStatus.h
405+
# Julia wrapper for header: SoundStatus.h
406406
# Automatically generated using Clang.jl
407407

408-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/SoundStream.h
408+
# Julia wrapper for header: SoundStream.h
409409
# Automatically generated using Clang.jl
410410

411411

@@ -504,6 +504,6 @@ end
504504
function sfSoundStream_getPlayingOffset(soundStream)
505505
ccall((:sfSoundStream_getPlayingOffset, libcsfml_audio), sfTime, (Ptr{sfSoundStream},), soundStream)
506506
end
507-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Audio/Types.h
507+
# Julia wrapper for header: Types.h
508508
# Automatically generated using Clang.jl
509509

src/Audio/audio_common.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ const sfSoundRecorderStartCallback = Ptr{Cvoid}
1212
const sfSoundRecorderProcessCallback = Ptr{Cvoid}
1313
const sfSoundRecorderStopCallback = Ptr{Cvoid}
1414

15-
@cenum(sfSoundStatus,
16-
sfStopped = 0,
17-
sfPaused = 1,
18-
sfPlaying = 2,
19-
)
15+
@cenum sfSoundStatus::UInt32 begin
16+
sfStopped = 0
17+
sfPaused = 1
18+
sfPlaying = 2
19+
end
20+
2021

2122
struct sfSoundStreamChunk
2223
samples::Ptr{sfInt16}

src/Graphics/graphics_api.jl

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics.h
1+
# Julia wrapper for header: Graphics.h
22
# Automatically generated using Clang.jl
33

4-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/BlendMode.h
4+
# Julia wrapper for header: BlendMode.h
55
# Automatically generated using Clang.jl
66

7-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/CircleShape.h
7+
# Julia wrapper for header: CircleShape.h
88
# Automatically generated using Clang.jl
99

1010

@@ -139,7 +139,7 @@ end
139139
function sfCircleShape_getGlobalBounds(shape)
140140
ccall((:sfCircleShape_getGlobalBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfCircleShape},), shape)
141141
end
142-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Color.h
142+
# Julia wrapper for header: Color.h
143143
# Automatically generated using Clang.jl
144144

145145

@@ -170,7 +170,7 @@ end
170170
function sfColor_modulate(color1, color2)
171171
ccall((:sfColor_modulate, libcsfml_graphics), sfColor, (sfColor, sfColor), color1, color2)
172172
end
173-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/ConvexShape.h
173+
# Julia wrapper for header: ConvexShape.h
174174
# Automatically generated using Clang.jl
175175

176176

@@ -301,10 +301,10 @@ end
301301
function sfConvexShape_getGlobalBounds(shape)
302302
ccall((:sfConvexShape_getGlobalBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfConvexShape},), shape)
303303
end
304-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Export.h
304+
# Julia wrapper for header: Export.h
305305
# Automatically generated using Clang.jl
306306

307-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Font.h
307+
# Julia wrapper for header: Font.h
308308
# Automatically generated using Clang.jl
309309

310310

@@ -355,16 +355,16 @@ end
355355
function sfFont_getInfo(font)
356356
ccall((:sfFont_getInfo, libcsfml_graphics), sfFontInfo, (Ptr{sfFont},), font)
357357
end
358-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/FontInfo.h
358+
# Julia wrapper for header: FontInfo.h
359359
# Automatically generated using Clang.jl
360360

361-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Glsl.h
361+
# Julia wrapper for header: Glsl.h
362362
# Automatically generated using Clang.jl
363363

364-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Glyph.h
364+
# Julia wrapper for header: Glyph.h
365365
# Automatically generated using Clang.jl
366366

367-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Image.h
367+
# Julia wrapper for header: Image.h
368368
# Automatically generated using Clang.jl
369369

370370

@@ -435,10 +435,10 @@ end
435435
function sfImage_flipVertically(image)
436436
ccall((:sfImage_flipVertically, libcsfml_graphics), Cvoid, (Ptr{sfImage},), image)
437437
end
438-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/PrimitiveType.h
438+
# Julia wrapper for header: PrimitiveType.h
439439
# Automatically generated using Clang.jl
440440

441-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Rect.h
441+
# Julia wrapper for header: Rect.h
442442
# Automatically generated using Clang.jl
443443

444444

@@ -457,7 +457,7 @@ end
457457
function sfIntRect_intersects(rect1, rect2, intersection)
458458
ccall((:sfIntRect_intersects, libcsfml_graphics), sfBool, (Ptr{sfIntRect}, Ptr{sfIntRect}, Ptr{sfIntRect}), rect1, rect2, intersection)
459459
end
460-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/RectangleShape.h
460+
# Julia wrapper for header: RectangleShape.h
461461
# Automatically generated using Clang.jl
462462

463463

@@ -588,10 +588,10 @@ end
588588
function sfRectangleShape_getGlobalBounds(shape)
589589
ccall((:sfRectangleShape_getGlobalBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfRectangleShape},), shape)
590590
end
591-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/RenderStates.h
591+
# Julia wrapper for header: RenderStates.h
592592
# Automatically generated using Clang.jl
593593

594-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/RenderTexture.h
594+
# Julia wrapper for header: RenderTexture.h
595595
# Automatically generated using Clang.jl
596596

597597

@@ -722,7 +722,7 @@ end
722722
function sfRenderTexture_generateMipmap(renderTexture)
723723
ccall((:sfRenderTexture_generateMipmap, libcsfml_graphics), sfBool, (Ptr{sfRenderTexture},), renderTexture)
724724
end
725-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/RenderWindow.h
725+
# Julia wrapper for header: RenderWindow.h
726726
# Automatically generated using Clang.jl
727727

728728

@@ -933,7 +933,7 @@ end
933933
function sfTouch_getPositionRenderWindow(finger, relativeTo)
934934
ccall((:sfTouch_getPositionRenderWindow, libcsfml_graphics), sfVector2i, (UInt32, Ptr{sfRenderWindow}), finger, relativeTo)
935935
end
936-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Shader.h
936+
# Julia wrapper for header: Shader.h
937937
# Automatically generated using Clang.jl
938938

939939

@@ -1104,7 +1104,7 @@ end
11041104
function sfShader_isGeometryAvailable()
11051105
ccall((:sfShader_isGeometryAvailable, libcsfml_graphics), sfBool, ())
11061106
end
1107-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Shape.h
1107+
# Julia wrapper for header: Shape.h
11081108
# Automatically generated using Clang.jl
11091109

11101110

@@ -1227,7 +1227,7 @@ end
12271227
function sfShape_update(shape)
12281228
ccall((:sfShape_update, libcsfml_graphics), Cvoid, (Ptr{sfShape},), shape)
12291229
end
1230-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Sprite.h
1230+
# Julia wrapper for header: Sprite.h
12311231
# Automatically generated using Clang.jl
12321232

12331233

@@ -1326,7 +1326,7 @@ end
13261326
function sfSprite_getGlobalBounds(sprite)
13271327
ccall((:sfSprite_getGlobalBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfSprite},), sprite)
13281328
end
1329-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Text.h
1329+
# Julia wrapper for header: Text.h
13301330
# Automatically generated using Clang.jl
13311331

13321332

@@ -1493,7 +1493,7 @@ end
14931493
function sfText_getGlobalBounds(text)
14941494
ccall((:sfText_getGlobalBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfText},), text)
14951495
end
1496-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Texture.h
1496+
# Julia wrapper for header: Texture.h
14971497
# Automatically generated using Clang.jl
14981498

14991499

@@ -1596,7 +1596,7 @@ end
15961596
function sfTexture_getMaximumSize()
15971597
ccall((:sfTexture_getMaximumSize, libcsfml_graphics), UInt32, ())
15981598
end
1599-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Transform.h
1599+
# Julia wrapper for header: Transform.h
16001600
# Automatically generated using Clang.jl
16011601

16021602

@@ -1647,7 +1647,7 @@ end
16471647
function sfTransform_equal(left, right)
16481648
ccall((:sfTransform_equal, libcsfml_graphics), sfBool, (Ptr{sfTransform}, Ptr{sfTransform}), left, right)
16491649
end
1650-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Transformable.h
1650+
# Julia wrapper for header: Transformable.h
16511651
# Automatically generated using Clang.jl
16521652

16531653

@@ -1714,13 +1714,13 @@ end
17141714
function sfTransformable_getInverseTransform(transformable)
17151715
ccall((:sfTransformable_getInverseTransform, libcsfml_graphics), sfTransform, (Ptr{sfTransformable},), transformable)
17161716
end
1717-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Types.h
1717+
# Julia wrapper for header: Types.h
17181718
# Automatically generated using Clang.jl
17191719

1720-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/Vertex.h
1720+
# Julia wrapper for header: Vertex.h
17211721
# Automatically generated using Clang.jl
17221722

1723-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/VertexArray.h
1723+
# Julia wrapper for header: VertexArray.h
17241724
# Automatically generated using Clang.jl
17251725

17261726

@@ -1767,7 +1767,7 @@ end
17671767
function sfVertexArray_getBounds(vertexArray)
17681768
ccall((:sfVertexArray_getBounds, libcsfml_graphics), sfFloatRect, (Ptr{sfVertexArray},), vertexArray)
17691769
end
1770-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/VertexBuffer.h
1770+
# Julia wrapper for header: VertexBuffer.h
17711771
# Automatically generated using Clang.jl
17721772

17731773

@@ -1826,7 +1826,7 @@ end
18261826
function sfVertexBuffer_isAvailable()
18271827
ccall((:sfVertexBuffer_isAvailable, libcsfml_graphics), sfBool, ())
18281828
end
1829-
# Julia wrapper for header: /Users/gnimuc/LibCSFML/gen/../deps/usr/include/SFML/Graphics/View.h
1829+
# Julia wrapper for header: View.h
18301830
# Automatically generated using Clang.jl
18311831

18321832

0 commit comments

Comments
 (0)