Clarify that GPU_SKINNING is not enabled by default and the requirements
This commit is contained in:
parent
f421b74c0f
commit
895154bcb2
|
|
@ -53,13 +53,19 @@ int main(void)
|
||||||
Model model = LoadModel("resources/models/gltf/robot.glb"); // Load character model
|
Model model = LoadModel("resources/models/gltf/robot.glb"); // Load character model
|
||||||
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model world position
|
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model world position
|
||||||
|
|
||||||
|
#if SUPPORT_GPU_SKINNING
|
||||||
|
// WARNING: SUPPORT_GPU_SKINNING is required to be enabled at raylib compile time (disabled by default)
|
||||||
|
// It will skip loading CPU required buffers to store animation updated data, so, both modes are exclusive
|
||||||
|
|
||||||
// Load skinning shader
|
// Load skinning shader
|
||||||
// WARNING: It requires SUPPORT_GPU_SKINNING enabled on raylib (disabled by default)
|
// NOTE: It must be a valid shader, following raylib attribs/uniform conventions for GPU skinning
|
||||||
Shader skinningShader = LoadShader(TextFormat("resources/shaders/glsl%i/skinning.vs", GLSL_VERSION),
|
Shader skinningShader = LoadShader(TextFormat("resources/shaders/glsl%i/skinning.vs", GLSL_VERSION),
|
||||||
TextFormat("resources/shaders/glsl%i/skinning.fs", GLSL_VERSION));
|
TextFormat("resources/shaders/glsl%i/skinning.fs", GLSL_VERSION));
|
||||||
|
|
||||||
// NOTE: Assign skinning shader to all materials shaders
|
// Skinning shader could be required to be assigned to all materials shaders, just to make
|
||||||
//for (int i = 0; i < model.materialCount; i++) model.materials[i].shader = skinningShader;
|
// sure required uniforms are being updated for the mesh using that material (and shader)
|
||||||
|
for (int i = 0; i < model.materialCount; i++) model.materials[i].shader = skinningShader;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Load model animations
|
// Load model animations
|
||||||
int animCount = 0;
|
int animCount = 0;
|
||||||
|
|
@ -275,7 +281,9 @@ int main(void)
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
UnloadModelAnimations(anims, animCount); // Unload model animation
|
UnloadModelAnimations(anims, animCount); // Unload model animation
|
||||||
UnloadModel(model); // Unload model and meshes/material
|
UnloadModel(model); // Unload model and meshes/material
|
||||||
|
#if SUPPORT_GPU_SKINNING
|
||||||
UnloadShader(skinningShader); // Unload GPU skinning shader
|
UnloadShader(skinningShader); // Unload GPU skinning shader
|
||||||
|
#endif
|
||||||
|
|
||||||
CloseWindow(); // Close window and OpenGL context
|
CloseWindow(); // Close window and OpenGL context
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -52,12 +52,19 @@ int main(void)
|
||||||
Model model = LoadModel("resources/models/gltf/greenman.glb"); // Load character model
|
Model model = LoadModel("resources/models/gltf/greenman.glb"); // Load character model
|
||||||
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position
|
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position
|
||||||
|
|
||||||
|
#if SUPPORT_GPU_SKINNING
|
||||||
|
// WARNING: SUPPORT_GPU_SKINNING is required to be enabled at raylib compile time (disabled by default)
|
||||||
|
// It will skip loading CPU required buffers to store animation updated data, so, both modes are exclusive
|
||||||
|
|
||||||
// Load skinning shader
|
// Load skinning shader
|
||||||
// WARNING: GPU skinning must be enabled in raylib with a compilation flag,
|
// NOTE: It must be a valid shader, following raylib attribs/uniform conventions for GPU skinning
|
||||||
// if not enabled, CPU skinning will be used instead
|
|
||||||
Shader skinningShader = LoadShader(TextFormat("resources/shaders/glsl%i/skinning.vs", GLSL_VERSION),
|
Shader skinningShader = LoadShader(TextFormat("resources/shaders/glsl%i/skinning.vs", GLSL_VERSION),
|
||||||
TextFormat("resources/shaders/glsl%i/skinning.fs", GLSL_VERSION));
|
TextFormat("resources/shaders/glsl%i/skinning.fs", GLSL_VERSION));
|
||||||
model.materials[1].shader = skinningShader;
|
|
||||||
|
// Skinning shader could be required to be assigned to all materials shaders, just to make
|
||||||
|
// sure required uniforms are being updated for the mesh using that material (and shader)
|
||||||
|
model.materials[1].shader = skinningShader; // Just assigning to materials[1] for this model
|
||||||
|
#endif
|
||||||
|
|
||||||
// Load gltf model animations
|
// Load gltf model animations
|
||||||
int animCount = 0;
|
int animCount = 0;
|
||||||
|
|
@ -111,7 +118,9 @@ int main(void)
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
UnloadModelAnimations(anims, animCount); // Unload model animation
|
UnloadModelAnimations(anims, animCount); // Unload model animation
|
||||||
UnloadModel(model); // Unload model and meshes/material
|
UnloadModel(model); // Unload model and meshes/material
|
||||||
|
#if SUPPORT_GPU_SKINNING
|
||||||
UnloadShader(skinningShader); // Unload GPU skinning shader
|
UnloadShader(skinningShader); // Unload GPU skinning shader
|
||||||
|
#endif
|
||||||
|
|
||||||
CloseWindow(); // Close window and OpenGL context
|
CloseWindow(); // Close window and OpenGL context
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user