Update tests, examples and add browser pseudofullscreen example

Author: manuel5975p

examples/CMakeLists.txt

@@ -51,6 +51,11 @@ endfunction()
 
 add_example(core_window)
 add_example(core_resizable)
+add_example(core_browser_extent)
+if(EMSCRIPTEN)
+    set_target_properties(core_browser_extent PROPERTIES LINK_FLAGS
+        "--shell-file ${CMAKE_SOURCE_DIR}/resources/shell_browser_extent.html")
+endif()
 add_example(core_shapes)
 add_example(rlfunctions)
 add_example(shaders_basic)
@@ -64,51 +69,41 @@ add_example(textures_generate)
 add_example(core_camera2d)
 add_example(core_camera3d)
 add_example(core_rendertexture)
-#add_example(pipeline_basic)
+add_example(pipeline_basic)
 add_example(pipeline_settings)
 add_example(input_keys)
 add_example(input_gamepad)
 add_example(input_multitouch_gesture)
 add_example(input_text)
-#add_example(models_cube)
+add_example(models_cube)
 add_example(split_screen_camera3d)
-#add_example(core_fonts)
+add_example(core_fonts)
 add_example(core_headless)
 add_example(core_cursor)
-#add_example(textures_array)
+add_example(textures_array)
 add_example(core_multiwindow)
-#add_example(memory_vma_allocator)
-#add_cpp_example(vao_multibuffer)
-#add_cpp_example(shader_inspection)
+#add_example(memory_vma_allocator) # Requires VMA library to be linked
+add_cpp_example(vao_multibuffer)
 add_cpp_example(compute)
-#add_cpp_example(shaders_glsl)
-#add_cpp_example(pipeline_instancing)
-if(SUPPORT_VULKAN_BACKEND)
-    #add_cpp_example(models_raytracing)
-endif()
-#add_cpp_example(pipeline_uniforms)
+add_cpp_example(shaders_glsl)
+add_cpp_example(pipeline_instancing)
+#if(SUPPORT_VULKAN_BACKEND)
+#    add_cpp_example(models_raytracing) # Requires vulkan_internals.hpp (not yet available)
+#endif()
+add_cpp_example(pipeline_uniforms)
 add_cpp_example(models_obj)
 add_cpp_example(models_lights)
 add_cpp_example(models_glb)
-#add_cpp_example(models_forwardkinematics)
-#add_cpp_example(pipeline_constants)
+add_cpp_example(models_forwardkinematics)
+add_cpp_example(pipeline_constants)
 add_example(benchmark_cubes)
-#add_cpp_example(benchmark_tilemap)
+add_cpp_example(benchmark_tilemap)
 add_cpp_example(core_screenrecord)
-#add_cpp_example(textures_formats)
+add_cpp_example(textures_formats)
 add_cpp_example(textures_mipmap)
 add_cpp_example(models_gpu_skinning)
-#add_cpp_example(textures_bloom)
-#if(SUPPORT_GLSL_PARSER)
-#    add_cpp_example(glsl_to_wgsl)
-#endif()
-#add_cpp_example(textures_storage)
-if(SUPPORT_VULKAN_BACKEND)
-    #add_executable(plain_wgvk "plain_wgvk.c")
-    #target_link_libraries(plain_wgvk PUBLIC wgvk)
-    #target_compile_features(plain_wgvk PUBLIC c_std_23)
-
-    #add_executable(surface_wgvk "surface_wgvk.c")
-    #target_link_libraries  (surface_wgvk PUBLIC wgvk glfw)
-    #target_compile_features(surface_wgvk PUBLIC c_std_23)
+add_cpp_example(textures_bloom)
+if(SUPPORT_GLSL_PARSER AND SUPPORT_WGSL_PARSER)
+    add_cpp_example(glsl_to_wgsl)
 endif()
+add_cpp_example(textures_storage)

examples/benchmark_tilemap.cpp

@@ -1,4 +1,5 @@
 #include <filesystem>
+#include <vector>
 #include <raygpu.h>
 #ifdef __EMSCRIPTEN__
 #include <emscripten.h>
@@ -41,7 +42,7 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4f {
 )";
 Texture tilemap;
 Camera2D cam;
-DescribedPipeline* shader;
+Shader shader;
 VertexArray* tileVAO;
 DescribedBuffer* tileVBO;
 DescribedBuffer* tileIBO;
@@ -51,14 +52,12 @@ int tileCount;
 
 void mainloop(){
     BeginDrawing();
-    //ClearBackground(BLACK);
-    BeginPipelineMode(shader);
+    BeginShaderMode(shader);
     BeginMode2D(cam);
-    BindPipelineVertexArray(shader, tileVAO);
-    DrawArraysIndexedInstanced(WGPUPrimitiveTopology_TriangleList, *tileIBO, 6, tileCount);
-    //DrawTexturePro(tilemap, Rectangle{0,0,(float)tilemap.width, (float)tilemap.height}, Rectangle{0,0,1000,1000}, Vector2{0,0}, 0.0f, WHITE);
+    BindShaderVertexArray(shader, tileVAO);
+    DrawArraysIndexedInstanced(RL_TRIANGLES, *tileIBO, 6, tileCount);
     EndMode2D();
-    EndPipelineMode();
+    EndShaderMode();
     DrawFPS(10,10);
     cam.zoom *= std::exp(GetMouseWheelMove() / 30.0f);
     const float speed = 200.0f;
@@ -77,25 +76,23 @@ void mainloop(){
     EndDrawing();
 }
 int main(){
-    //SetConfigFlags(FLAG_MSAA_4X_HINT);
     SetConfigFlags(FLAG_VSYNC_HINT);
     std::filesystem::path p(".");
     std::cout << std::filesystem::absolute(p) << "\n";
     InitWindow(640, 480, "Tilemap Benchmark");
     SetTargetFPS(0);
     Image img = LoadImage("../resources/tileset.png");
-    //Image img = GenImageColor(RED, 100, 100);
     tilemap = LoadTextureFromImage(img);
     cam = Camera2D{
-        .offset = Vector2{GetScreenWidth() / 2.0f, GetScreenHeight() / 2.0f}, 
+        .offset = Vector2{GetScreenWidth() / 2.0f, GetScreenHeight() / 2.0f},
         .target = Vector2{0,0},
-        .rotation = 0.0f, 
+        .rotation = 0.0f,
         .zoom = 100.0f
     };
     shader = LoadPipeline(wgsl);
 
-    SetPipelineTexture(shader, 1, tilemap);
-    SetPipelineSampler(shader, 2, LoadSampler(repeat, nearest));
+    SetShaderTexture(shader, 1, tilemap);
+    SetShaderSampler(shader, 2, LoadSampler(TEXTURE_WRAP_REPEAT, TEXTURE_FILTER_POINT));
     tileVAO = LoadVertexArray();
     float tileVertices [8] = {
         0, 0,
@@ -107,7 +104,7 @@ int main(){
         0,1,2,0,2,3
     };
     tileIBO = GenIndexBuffer(tileIndices, sizeof(tileIndices));
-    tileVBO = GenBuffer(tileVertices, sizeof(tileVertices));
+    tileVBO = GenVertexBuffer(tileVertices, sizeof(tileVertices));
     std::vector<Vector2> offsets;
     std::vector<uint32_t> tt;
     int w = 1000;
@@ -120,17 +117,16 @@ int main(){
             ++tileCount;
         }
     }
-    //std::cout << tileCount << "\n";
-    tileOffsets = GenBuffer(offsets.data(), offsets.size() * sizeof(Vector2));
+    tileOffsets = GenVertexBuffer(offsets.data(), offsets.size() * sizeof(Vector2));
     tileTypes = GenStorageBuffer(tt.data(), tt.size() * sizeof(uint32_t));
-    VertexAttribPointer(tileVAO, tileVBO, 0, WGPUVertexFormat_Float32x2, 0, WGPUVertexStepMode_Vertex);
-    VertexAttribPointer(tileVAO, tileOffsets, 1, WGPUVertexFormat_Float32x2, 0, WGPUVertexStepMode_Instance);
-    SetPipelineStorageBuffer(shader, 3, tileTypes);
+    VertexAttribPointer(tileVAO, tileVBO, 0, RGVertexFormat_Float32x2, 0, RGVertexStepMode_Vertex);
+    VertexAttribPointer(tileVAO, tileOffsets, 1, RGVertexFormat_Float32x2, 0, RGVertexStepMode_Instance);
+    SetShaderStorageBuffer(shader, 3, tileTypes);
     #ifdef __EMSCRIPTEN__
     emscripten_set_main_loop(mainloop, 0, 0);
     #else
     while(!WindowShouldClose()){
         mainloop();
     }
     #endif
-}
+}

examples/compute.cpp

@@ -103,11 +103,12 @@ constexpr bool headless = false;
 
 constexpr size_t parts = (1 << 16);
 void mainloop(void){
-    BeginDrawing();
     BeginComputepass();
     BindComputePipeline(firstPassPipeline);
     DispatchCompute(parts / 64, 64, 1);
     EndComputepass();
+
+    BeginDrawing();
     ClearBackground(BLACK);
 
     BeginShaderMode(rpl);

examples/core_browser_extent.c

@@ -0,0 +1,43 @@
+#include <raygpu.h>
+
+void setup(void){
+}
+
+void render(void){
+    BeginDrawing();
+    ClearBackground((Color){40, 44, 52, 255});
+
+    const char* title = "Browser Extent Example";
+    int fontSize = 40;
+    DrawText(title, GetScreenWidth() / 2 - MeasureText(title, fontSize) / 2, 40, fontSize, WHITE);
+
+    const char* sizeText = TextFormat("Canvas: %d x %d", GetScreenWidth(), GetScreenHeight());
+    DrawText(sizeText, GetScreenWidth() / 2 - MeasureText(sizeText, 20) / 2, 100, 20, (Color){150, 150, 150, 255});
+
+    DrawText(
+        "Resize your browser window - the canvas follows",
+        GetScreenWidth() / 2 - MeasureText("Resize your browser window - the canvas follows", 20) / 2,
+        140, 20, (Color){100, 200, 100, 255}
+    );
+
+    DrawRectangleLinesEx((Rectangle){2, 2, (float)GetScreenWidth() - 4, (float)GetScreenHeight() - 4}, 2.0f, (Color){80, 80, 80, 255});
+
+    DrawCircleSector(GetMousePosition(), 30.0f, 0.0f, 360.0f, 64, (Color){100, 149, 237, 200});
+    DrawFPS(10, 10);
+    if(IsKeyPressed(KEY_F)){
+        ToggleFullscreen();
+    }
+    EndDrawing();
+}
+
+int main(void){
+    SetConfigFlags(FLAG_WINDOW_RESIZE_TO_BROWSER_EXTENT | FLAG_WINDOW_RESIZABLE | FLAG_VSYNC_HINT);
+    ProgramInfo progInfo = {
+        .windowTitle = "Browser Extent",
+        .windowWidth = 800,
+        .windowHeight = 600,
+        .setupFunction = setup,
+        .renderFunction = render
+    };
+    InitProgram(progInfo);
+}

examples/models_cube.c

@@ -1,13 +1,14 @@
 #include <raygpu.h>
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 #ifdef __EMSCRIPTEN__
 #include <emscripten.h>
 #endif
 
 Camera3D cam;
 Mesh cube;
-DescribedPipeline* pl;
+Shader pl;
 Texture checkers;
 Texture checkersHDR;
 float angle;
@@ -70,15 +71,13 @@ void mainloop(void){
     angle += GetFrameTime();
     cam.position = (Vector3){sinf(angle) * 10.f, 5.0f, cosf(angle) * 10.f};
     ClearBackground(BLACK);
-    //TODO: Swapping the next two causes a problem since the BindGroup is lazily updated only at BindPipeline
-    //EDIT: It's not due to lazy update; DrawArrays and DrawArraysIndexed did not check for a pending Bindgroup Update
-    BeginPipelineMode(pl);
+    BeginShaderMode(pl);
     UseTexture(checkersHDR);
     BeginMode3D(cam);
     BindVertexArray(cube.vao);
     DrawArraysIndexed(RL_TRIANGLES, *cube.ibo, 36);
     EndMode3D();
-    EndPipelineMode();
+    EndShaderMode();
     DrawFPS(0, 0);
     if(IsKeyPressed(KEY_U)){
         ToggleFullscreen();
@@ -87,18 +86,16 @@ void mainloop(void){
 }
 int main(cwoid){
     SetConfigFlags(FLAG_VSYNC_HINT);
-    //SetConfigFlags(FLAG_MSAA_4X_HINT);
     InitWindow(1200, 800, "VAO");
-    //SetTargetFPS(300);
     cam = CLITERAL(Camera3D){
         .position = CLITERAL(Vector3){0,0,10},
         .target = CLITERAL(Vector3){0,0,0},
         .up = CLITERAL(Vector3){0,1,0},
         .fovy = 45.0f
     };
     cube = GenMeshCube(3.f,3.f,3.f);
-    //assert(cube.ibo.buffer == 0);
-    pl = Relayout(DefaultPipeline(), cube.vao);
+    pl = DefaultShader();
+    PrepareShader(pl, cube.vao);
     checkersHDR = LoadTextureEx(9, 9, PIXELFORMAT_UNCOMPRESSED_R16G16B16A16, false);
 
     checkers = LoadTextureFromImage(GenImageChecker(RED, DARKBLUE, 9, 9, 4));
@@ -116,7 +113,7 @@ int main(cwoid){
         checkersData[4 * i + 2] = (i & 1) ? 255 : 0;
         checkersData[4 * i + 3] = 255;
     }
-    
+
     UpdateTexture(checkersHDR, checkersHDRData);
     UpdateTexture(checkers, checkersData);
     angle = 0.0f;

examples/models_forwardkinematics.cpp

@@ -56,7 +56,7 @@ void calculate_tx2_90_fk_mu(const float q[6], Matrix T_out[7]) {
     const float d[]     = {0.478f, 0.0f, 0.0f, 0.425f, 0.0f, 0.100f};
     // theta_i uses q[i]
 
-    Matrix T_prev_curr zeroinit; // Transform {i-1} to {i}
+    Matrix T_prev_curr = {}; // Transform {i-1} to {i}
 
     // T_out[0] is Base Frame relative to Base (Identity)
     T_out[0] = MatrixIdentity();

examples/pipeline_basic.c

@@ -4,36 +4,35 @@
 #endif
 VertexArray* vao;
 DescribedBuffer* vbo;
-DescribedPipeline* pipeline;
+Shader pipeline;
 void mainloop(cwoid){
     BeginDrawing();
     ClearBackground(BLACK);
-    BeginPipelineMode(pipeline);
+    BeginShaderMode(pipeline);
     BindShaderVertexArray(pipeline, vao);
     DrawArrays(RL_TRIANGLES, 3);
-    EndPipelineMode();
+    EndShaderMode();
     DrawFPS(0,0);
     EndDrawing();
 }
 int main(void){
     InitWindow(800, 600, "The Render Pipeline");
     const char* resourceDirectoryPath = FindDirectory("resources", 3);
     char* shaderSource = LoadFileText(TextFormat("%s/simple_shader.wgsl", resourceDirectoryPath));
-    
+
     float vertices[6] = {
         0,0,
         1,0,
         0,1
     };
-    vbo = GenVertexBuffer(vertices, sizeof(vertices)); 
+    vbo = GenVertexBuffer(vertices, sizeof(vertices));
     vao = LoadVertexArray();
-    VertexAttribPointer(vao, vbo, 0, WGPUVertexFormat_Float32x2, 0, WGPUVertexStepMode_Vertex);
+    VertexAttribPointer(vao, vbo, 0, RGVertexFormat_Float32x2, 0, RGVertexStepMode_Vertex);
     EnableVertexAttribArray(vao, 0);
     pipeline = LoadPipeline(shaderSource);
 
-    float uniformData[4] = {0,0,0,0};
     SetTargetFPS(0);
-    
+
     #ifndef __EMSCRIPTEN__
     while(!WindowShouldClose()){
         mainloop();