a6db31c01e
* Removed Unused Uniforms
uniform vec3 viewUp;
uniform float deltaTime;
* Removed Unused uniforms
uniform vec3 viewUp;
uniform float deltaTime;
* Updated Source
Added - #define PLATFORM_DESKTOP line for desktop users.
This now will correctly find the proper glsl version for the raymarching.fs file.
Removed - Uniforms --> deltaTime and viewUp. Including the code that was setting them.
They were never used and they were triggering a log warning.
Removed - The const from both screenWidth and screenHeight.
Now they can be used to update the shader resolution when screen is resized.
NOTE : This is a quick fix and probably not the best idea.
Added - IsWindowResized() to check if screen is resized.
If window is resized then width, height and shader resolution are updated.
Changed - MIT tag at bottom right color value to BLACK. Now it's easier to see.
* Closer Match to original code
* Removed the PLATFORM_DESKTOP Define
119 lines
5.0 KiB
C
119 lines
5.0 KiB
C
/*******************************************************************************************
|
|
*
|
|
* raylib [shaders] example - Raymarching shapes generation
|
|
*
|
|
* NOTE: This example requires raylib OpenGL 3.3 or ES2 versions for shaders support,
|
|
* OpenGL 1.1 does not support shaders, recompile raylib to OpenGL 3.3 version.
|
|
*
|
|
* NOTE: Shaders used in this example are #version 330 (OpenGL 3.3), to test this example
|
|
* on OpenGL ES 2.0 platforms (Android, Raspberry Pi, HTML5), use #version 100 shaders
|
|
* raylib comes with shaders ready for both versions, check raylib/shaders install folder
|
|
*
|
|
* This example has been created using raylib 2.0 (www.raylib.com)
|
|
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
|
|
*
|
|
* Copyright (c) 2018 Ramon Santamaria (@raysan5)
|
|
*
|
|
********************************************************************************************/
|
|
|
|
#include "raylib.h"
|
|
|
|
#if defined(PLATFORM_DESKTOP)
|
|
#define GLSL_VERSION 330
|
|
#else // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
|
|
#define GLSL_VERSION 100
|
|
#endif
|
|
|
|
int main(void)
|
|
{
|
|
// Initialization
|
|
//--------------------------------------------------------------------------------------
|
|
int screenWidth = 800;
|
|
int screenHeight = 450;
|
|
|
|
SetConfigFlags(FLAG_WINDOW_RESIZABLE);
|
|
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - raymarching shapes");
|
|
|
|
Camera camera = { 0 };
|
|
camera.position = (Vector3){ 2.5f, 2.5f, 3.0f }; // Camera position
|
|
camera.target = (Vector3){ 0.0f, 0.0f, 0.7f }; // Camera looking at point
|
|
camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target)
|
|
camera.fovy = 65.0f; // Camera field-of-view Y
|
|
|
|
SetCameraMode(camera, CAMERA_FREE); // Set camera mode
|
|
|
|
// Load raymarching shader
|
|
// NOTE: Defining 0 (NULL) for vertex shader forces usage of internal default vertex shader
|
|
Shader shader = LoadShader(0, FormatText("resources/shaders/glsl%i/raymarching.fs", GLSL_VERSION));
|
|
|
|
// Get shader locations for required uniforms
|
|
int viewEyeLoc = GetShaderLocation(shader, "viewEye");
|
|
int viewCenterLoc = GetShaderLocation(shader, "viewCenter");
|
|
int runTimeLoc = GetShaderLocation(shader, "runTime");
|
|
int resolutionLoc = GetShaderLocation(shader, "resolution");
|
|
|
|
float resolution[2] = { (float)screenWidth, (float)screenHeight };
|
|
SetShaderValue(shader, resolutionLoc, resolution, UNIFORM_VEC2);
|
|
|
|
float runTime = 0.0f;
|
|
|
|
SetTargetFPS(60); // Set our game to run at 60 frames-per-second
|
|
//--------------------------------------------------------------------------------------
|
|
|
|
// Main game loop
|
|
while (!WindowShouldClose()) // Detect window close button or ESC key
|
|
{
|
|
// Check if screen is resized
|
|
//----------------------------------------------------------------------------------
|
|
if(IsWindowResized())
|
|
{
|
|
screenWidth = GetScreenWidth();
|
|
screenHeight = GetScreenHeight();
|
|
float resolution[2] = { (float)screenWidth, (float)screenHeight };
|
|
SetShaderValue(shader, resolutionLoc, resolution, UNIFORM_VEC2);
|
|
}
|
|
|
|
// Update
|
|
//----------------------------------------------------------------------------------
|
|
UpdateCamera(&camera); // Update camera
|
|
|
|
float cameraPos[3] = { camera.position.x, camera.position.y, camera.position.z };
|
|
float cameraTarget[3] = { camera.target.x, camera.target.y, camera.target.z };
|
|
|
|
float deltaTime = GetFrameTime();
|
|
runTime += deltaTime;
|
|
|
|
// Set shader required uniform values
|
|
SetShaderValue(shader, viewEyeLoc, cameraPos, UNIFORM_VEC3);
|
|
SetShaderValue(shader, viewCenterLoc, cameraTarget, UNIFORM_VEC3);
|
|
SetShaderValue(shader, runTimeLoc, &runTime, UNIFORM_FLOAT);
|
|
//----------------------------------------------------------------------------------
|
|
|
|
// Draw
|
|
//----------------------------------------------------------------------------------
|
|
BeginDrawing();
|
|
|
|
ClearBackground(RAYWHITE);
|
|
|
|
// We only draw a white full-screen rectangle,
|
|
// frame is generated in shader using raymarching
|
|
BeginShaderMode(shader);
|
|
DrawRectangle(0, 0, screenWidth, screenHeight, WHITE);
|
|
EndShaderMode();
|
|
|
|
DrawText("(c) Raymarching shader by Iñigo Quilez. MIT License.", screenWidth - 280, screenHeight - 20, 10, BLACK);
|
|
|
|
EndDrawing();
|
|
//----------------------------------------------------------------------------------
|
|
}
|
|
|
|
// De-Initialization
|
|
//--------------------------------------------------------------------------------------
|
|
UnloadShader(shader); // Unload shader
|
|
|
|
CloseWindow(); // Close window and OpenGL context
|
|
//--------------------------------------------------------------------------------------
|
|
|
|
return 0;
|
|
}
|