Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added rudimentary SVG support. #2738

Merged
merged 6 commits into from
Sep 2, 2023
Merged

Added rudimentary SVG support. #2738

merged 6 commits into from
Sep 2, 2023

Conversation

bXi
Copy link
Contributor

@bXi bXi commented Oct 2, 2022

I've added NanoSVG to add the loading of SVG files into Raylib.

Created 2 functions to load .svg files.

ImageLoadSvg(filename); //Loads a file using the configured size inside the .svg file
ImageLoadSvgWithSize(filename, width, height); //Loads a file and scales it up to fit inside the provided width/height

raysan5
raysan5 reviewed Oct 5, 2022
View reviewed changes
examples/textures/textures_svg_loading.c Outdated Show resolved Hide resolved
src/rtextures.c Outdated Show resolved Hide resolved
src/raylib.h Outdated Show resolved Hide resolved
src/raylib.h Outdated Show resolved Hide resolved
src/rtextures.c Outdated Show resolved Hide resolved
src/rtextures.c Outdated Show resolved Hide resolved
src/rtextures.c Outdated Show resolved Hide resolved
src/rtextures.c Show resolved Hide resolved
@raysan5
Copy link
Owner

raysan5 commented Oct 5, 2022

@bXi Adding some review notes. What is the license of the provided SVG image? Is test.svg its original name?

@bXi
Added actual correct example file.
5779239
@bXi
Reviewed the code to keep the raylib coding conventions in mind.
11d28d2 
Moved the LoadImageSvg() code into LoadImage() guarded by SUPPORT_FILEFORMAT_SVG.
Renamed LoadImageSvgWithSize() to LoadImageSvg().
Added a LoadImageSvgFromString() function to parse the loaded SVG into an actual image. This does the bulk of the work.
@bXi
Fixed typo.
e0c41f8
@bXi bXi closed this Oct 17, 2022
@raysan5
Copy link
Owner

raysan5 commented Oct 17, 2022

@bXi Why did you close this PR?

@bXi
Copy link
Contributor Author

bXi commented Oct 17, 2022

@raysan5 I've decided to do this PR over from scratch using a hopefully less overengineered method for both functions.

@raysan5
Copy link
Owner

raysan5 commented Oct 17, 2022

@bXi Ok, perfect. Thank you very much!

@Dima-aka-dima
Copy link

@bXi sorry for the ping. Is there any progress on this feature?

@bXi
Copy link
Contributor Author

bXi commented Apr 14, 2023

@Dima-aka-dima sadly not. I've been to busy to work on this properly. You can use the commits to implement this for yourself. All the code is available up there.

@grantcarthew
Copy link

Hi @raysan5, I was looking for SVG support. Is the code here ok to use? I'm no expert at raylib yet.

@raysan5
Copy link
Owner

raysan5 commented Aug 28, 2023

@grantcarthew yes, the code here should work.

@bXi Is it possible to load the SVG files at a default size, for example defined to 96ppi? That way SVG could be just processed by LoadImage().

Also, is there some SVG identifier on a SVG string? That way LoadImageSvg() could validate if input is a file or a string to load it at a provided size/ppi.

@raysan5 raysan5 reopened this Aug 28, 2023
@bXi
Copy link
Contributor Author

bXi commented Aug 28, 2023

@raysan5 the LoadImageSvg() function reads the data inside the .svg file to load it at the size specified in the .svg.

If you have a look at the first tag inside the .svg file: <svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2484" viewBox="0 0 192.756 191.488"> it would be trivial to detect svg files based on the existence of the "<svg" string inside the file.

The only problem I can see from a quick glance would be that whitespace is allowed before the <svg> tag so that would have to be trimmed out before checking.

I will add that the power of .svg comes from the fact that it is a scalable format. That is the reason I added the function to allow svg loading at a specific size so you can always have the most crisp output for your needs. (inspired by the font loading functions basically)

After checking the commits (it has been a while) I do see that I changed LoadImage() to work with .svg files as described.

@grantcarthew
Copy link

grantcarthew commented Aug 28, 2023 •
edited
Loading

This is great guys. I was planning on building it myself as a method of learning zig through the raylib-zig library. I'd rather save the time if I can.

Is there some way I can help? I am green when it comes to C, raylib, and zig. I've done some C++ before but not for a couple of years.

edit: time is a factor also :(

@grantcarthew
Copy link

This is fantastic @raysan5 and @bXi I'll have a play as soon as I get time. Thanks.
If there is a feature missing for SVG, I'll open a PR.

@raysan5 raysan5 merged commit c03ab03 into raysan5:master Sep 2, 2023
12 checks passed
@raysan5
Copy link
Owner

raysan5 commented Sep 2, 2023

Merged for further review...

raysan5 added a commit that referenced this pull request Sep 17, 2023
@Brian-ED @raysan5
@ashn-dot-dev @actondev @VitusVeit @asdqwe @JeffM2501 @Dial0 @nickyMcDonald @branc116 @iacore @IrishBruse @jbarthelmes @bXi @rcorre @eltociear @SuperUserNameMan @michaelfiber @cubeofborg @vushu @gabrielssanches @RobLoach @Peter0x44 @Its-Kenta @bohonghuang @turborium @wilsonsilva
general syntax fixes (#3319)
acf211a 
* Prettified a comment

* fixed broken indentation caused by another commit.
the commit renamed a bool to int and broke indentation: 233cf39

* Changed 0.001 and 0.00001 to EPSILON
This commit is untested.
I don't know what consequences this has.
Since the commits that added these numbers were before epsilon was added,
I have assumed that epsilon could replace them.

* Prettied up indentation in a few places

* removed spacing around *, standardizing it.

* I may have gotten overboard with indentation

* removed a few useless parenthesis

* Added fortran-raylib

* Fix examples/others/rlgl_standalone.c compilation issue (#3242)

* Update BINDINGS.md

* Ignore unused return value of GetCodepointNext in GetCodepointCount (#3241)

* Ignore unused return value of GetCodepointNext in GetCodepointCount

Removes the last warning from non-external libraries when compiling with
the default build configuration on x64 Linux.

* Remove unnecessary void cast in GetCodepointCount

* Fix #3246

* Revert "Fix #3246"

This reverts commit e4dcbd5.

* Fix text_unicode.c example crashing (#3250)

* Fix text_unicode.c example crashing

* Adjust the text_unicode.c example crashing fix

* tweaks

* add build.zig options for individual modules (#3254)

* Add `IsKeyPressedRepeat` (desktop only) (#3245)

Since the key pressed are handle by comparing current vs previous
state (ie frame), a special way is needed to handle key repeats.

* Reviewed `IsKeyPressedRepeat()` #3248

* Update rcore.c (#3255)

* Match CMakeOptions.txt options default values (#3258)

* Fix SetClipboardText for web (#3257)

* [Image] Validate that ImageDrawRectangleRec is drawing entirely inside the image (#3264)

* Add a function to clone a sound and share data with another sound.

* rename items based on feedback

* PR Feedback, use custom unload for sound alias, not variant of normal sound unloading

* sound_multi example

* Validate that image rect drawing is inside the image so we don't overflow a buffer

* remove files that should not have been added.

* remove changes that should not have been

* revert

* adsfasdfsdfsdf

* Add Vector3 Projecting and Rejection to Raymath (#3263)

* Update raymath.h

* formatting

* [Feature] IsKey... safety checks and more (#3256)

* [Feature] Add GetKeyRepeat

* Update rcore.c

* Simpler design, only one repeat per frame

* Update config.h

* Update rcore.c

* Add KEYBOARD_KEYS_MASK

* Update config.h

* reversions

* Update rcore.c

* Update rcore.c

* change docs

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update raylib.h

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Update rcore.c

* Fix bug where default shaders was not linking. (#3261)

* Formating review

* Add missing cmake options (#3267)

* Fix CMake extraneous -lglfw (#3266)

Closes #3265.

The problem: LIBS_PRIVATE is a list of library names (used by pkg-config), but the shared library of the same name doesn't always exist.

* Fix example/models/models_loading_gltf.c controls (#3268)

* Fix example/models/models_loading_m3d.c controls (#3269)

* Remove e from secondes (#3270)

* Fix example/audio/audio_module_player.c help instructions and small bug (#3272)

* Fix example/audio/audio_module_player.c help instructions and small bug

* Update example/audio/audio_module_player.png screenshot

* Use type name instead of valid specifier

long long --> long long int

* REVIEWED: `GetFileLength()`, added comment #3262

* Update examples/models/models_loading_gltf.png;m3d.png screenshots (#3273)

* Remove a duplicated screenshot and add missing one (#3275)

* Add examples/shaders/shaders_lightmap.c to Makefiles (#3276)

* Fix examples/others/easings_testbed.c help instructions and small tweak (#3277)

* Fix examples/shaders/shaders_texture_outline.c help instructions (#3278)

* Fix examples/shapes/shapes_collision_area.c help instructions (#3279)

* RENAMED: LoadFont*() parameter names for consistency and coherence

* Fix uninitialized thread-locals in stbi #3282 (#3283)

* REVIEWED: Added `SetTextLineSpacing()` to multiline examples

* REVIEWED: Data size type consistency between functions #3168

* Some tweaks

* Use internal default allocators, instead of user-exposed ones

* Added rudimentary SVG support. (#2738)

* Added rudimentary SVG support. Added 2 functions ImageLoadSvg and ImageLoadSvgWithSize.

* Added an example on how to use ImageLoadSvgWithSize and adjusted Makefiles accordingly.

* Added actual correct example file.

* Reviewed the code to keep the raylib coding conventions in mind.
Moved the LoadImageSvg() code into LoadImage() guarded by SUPPORT_FILEFORMAT_SVG.
Renamed LoadImageSvgWithSize() to LoadImageSvg().
Added a LoadImageSvgFromString() function to parse the loaded SVG into an actual image. This does the bulk of the work.

* Fixed typo.

---------

Co-authored-by: Ray <[email protected]>

* REVIEWED: `LoadImageSvg()`

* REVIEWED: `LoadImageSvg()`

* Add SUPPORT_FILEFORMAT_SVG to cmake (#3284)

* Fix examples/textures/textures_fog_of_war.c help instructions (#3285)

* Fix examples/textures/textures_image_rotate.c help instructions (#3286)

* Update rtextures.c

* Fix #3247

* Update config.h

* Fix #3293

* Disable UBSAN in zig builds. (#3292)

Zig debug builds automatically enable ubsan.
As the fix for #1891 had to be reverted, debug builds using zig will crash like so:

```
Illegal instruction at address 0x3237d2
raylib/src/rlgl.h:3690:91: 0x3237d2 in rlDrawVertexArrayElements (/home/rcorre/src/raylib-zig-template/raylib/src/rcore.c)
    glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (const unsigned short *)buffer + offset);
```

This disables UBSAN when using zig to build raylib.

* Update README.md (#3290)

specially -> especially

* Update cmake SUPPORT_FILEFORMAT_SVG default value (#3291)

* Mouse offset and scaling must be considered also on web!

* Update rcore.c

* Update Makefile : clean raygui.c & physac.c (#3296)

* Remove PLATFORM_RPI (#3232)

* Remove PLATFORM_RPI

* remove build artifacts

---------

Co-authored-by: MichaelFiber <[email protected]>
Co-authored-by: Ray <[email protected]>

* Review to avoid UBSAN complaining #1891

* added raylib-raku to bindings (#3299)

* examples: core: adds 2D camera two player split screen (#3298)

* Reviewed examples for consistency

* Update rtext.c

* Some code restructuring for input functions, consistency review

* Remove unneeded #if (#3301)

Co-authored-by: MichaelFiber <[email protected]>

* Revert "Disable UBSAN in zig builds. (#3292)" (#3303)

This reverts commit a316f9e.

Issue #1891 was fixed again, so this is no longer needed.

* rtextures: Fix ImageDraw() source clipping when drawing beyond top left (#3306)

* REVIEWED: `TextToPascal()` issue when first char is uppercase

* Implement FLAG_WINDOW_RESIZABLE for web (#3305)

Fixes #3231

* Update BINDINGS.md (#3307)

Fix Kaylib binding. Reroute to a new repository.
Binding renamed.

* Update webassembly.yml

* Add claw-raylib to BINDINGS.md (#3310)

* Add SetWindowMaxSize for desktop and web (#3309)

* Add SetWindowMaxSize for desktop and web

* Remove SizeInt and respective adjustments

* Update rtextures.c

* Reviewed parameters for consistency

* Rename windowM* to screenM* (#3312)

* Update BINDINGS.md (#3317)

Update TurboRaylib bindings

* Update rmodels.c

* Update BINDINGS.md with vaiorabbit/raylib-bindings (#3318)

* fixed spelling mistake

* put back parenthesis

* reverted major allignment changes

* reverted parser output changes

* reverted one more indentation change

---------

Co-authored-by: Brian-E <[email protected]>
Co-authored-by: Ray <[email protected]>
Co-authored-by: ubkp <[email protected]>
Co-authored-by: ashn <[email protected]>
Co-authored-by: actondev (Christos) <[email protected]>
Co-authored-by: vitopigno <[email protected]>
Co-authored-by: Asdqwe <[email protected]>
Co-authored-by: Jeffery Myers <[email protected]>
Co-authored-by: Ethan Simpson <[email protected]>
Co-authored-by: Nickolas McDonald <[email protected]>
Co-authored-by: Branimir Ričko <[email protected]>
Co-authored-by: iacore <[email protected]>
Co-authored-by: Ethan Conneely <[email protected]>
Co-authored-by: Johannes Barthelmes <[email protected]>
Co-authored-by: bXi <[email protected]>
Co-authored-by: Ryan Roden-Corrent <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: SuperUserNameMan <[email protected]>
Co-authored-by: MichaelFiber <[email protected]>
Co-authored-by: MichaelFiber <[email protected]>
Co-authored-by: Dan Vu <[email protected]>
Co-authored-by: Gabriel dos Santos Sanches <[email protected]>
Co-authored-by: Rob Loach <[email protected]>
Co-authored-by: Peter0x44 <[email protected]>
Co-authored-by: Kenta <[email protected]>
Co-authored-by: bohonghuang <[email protected]>
Co-authored-by: turborium <[email protected]>
Co-authored-by: Wilson Silva <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raysan5 raysan5 raysan5 left review comments

@orcmid orcmid orcmid left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bXi @raysan5 @Dima-aka-dima @grantcarthew @orcmid