UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix vector angle example mode 0 circle segment drawing (#3150)

Browse source
This commit is contained in:
Gisteron 2023-07-02 18:51:27 +02:00 • committed by GitHub
parent d1ab031a27
commit 64bb2fe3ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
examples/Makefile
View file

@ -536,12 +536,20 @@ AUDIO = \
audio/audio_stream_effects \ audio/audio_stream_effects \
audio/audio_mixed_processor audio/audio_mixed_processor
OTHERS = \
others/easings_testbed \
others/embedded_files_loading \
others/raylib_opengl_interop \
others/raymath_vector_angle \
others/rlgl_compute_shader \
others/rlgl_standalone
CURRENT_MAKEFILE = $(lastword $(MAKEFILE_LIST)) CURRENT_MAKEFILE = $(lastword $(MAKEFILE_LIST))
# Define processes to execute # Define processes to execute
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
# Default target entry # Default target entry
all: $(CORE) $(SHAPES) $(TEXT) $(TEXTURES) $(MODELS) $(SHADERS) $(AUDIO) all: $(CORE) $(SHAPES) $(TEXT) $(TEXTURES) $(MODELS) $(SHADERS) $(AUDIO) $(OTHERS)
core: $(CORE) core: $(CORE)
shapes: $(SHAPES) shapes: $(SHAPES)
@ -550,6 +558,7 @@ text: $(TEXT)
models: $(MODELS) models: $(MODELS)
shaders: $(SHADERS) shaders: $(SHADERS)
audio: $(AUDIO) audio: $(AUDIO)
others: $(OTHERS)
# Generic compilation pattern # Generic compilation pattern
# NOTE: Examples must be ready for Android compilation! # NOTE: Examples must be ready for Android compilation!

7
examples/others/raymath_vector_angle.c
View file

@ -49,14 +49,14 @@ int main(void)
// Calculate angle between two vectors, considering a common origin (v0) // Calculate angle between two vectors, considering a common origin (v0)
v1 = Vector2Add(v0, (Vector2){ 100.0f, 80.0f }); v1 = Vector2Add(v0, (Vector2){ 100.0f, 80.0f });
v2 = GetMousePosition(); v2 = GetMousePosition();
angle = Vector2Angle(Vector2Normalize(Vector2Subtract(v1, v0)), Vector2Normalize(Vector2Subtract(v2, v0)))*RAD2DEG; angle = 90 - Vector2LineAngle(v0, v2) * RAD2DEG;
} }
else if (angleMode == 1) else if (angleMode == 1)
{ {
// Calculate angle defined by a two vectors line, in reference to horizontal line // Calculate angle defined by a two vectors line, in reference to horizontal line
v1 = (Vector2){ screenWidth/2, screenHeight/2 }; v1 = (Vector2){ screenWidth/2, screenHeight/2 };
v2 = GetMousePosition(); v2 = GetMousePosition();
angle = Vector2LineAngle(v1, v2)*RAD2DEG; angle = Vector2LineAngle(v1, v2) * RAD2DEG;
} }
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -77,8 +77,7 @@ int main(void)
DrawLineEx(v0, v1, 2.0f, BLACK); DrawLineEx(v0, v1, 2.0f, BLACK);
DrawLineEx(v0, v2, 2.0f, RED); DrawLineEx(v0, v2, 2.0f, RED);
// TODO: Properly draw circle sector DrawCircleSector(v0, 40.0f, 90 - Vector2LineAngle(v0, v1) * RAD2DEG, angle, 32, Fade(GREEN, 0.6f));
DrawCircleSector(v0, 40.0f, Vector2LineAngle(v0, v1)*RAD2DEG, angle, 32, Fade(GREEN, 0.6f));
} }
else if (angleMode == 1) else if (angleMode == 1)
{ {