aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2015-09-02 01:07:16 +0200
committerraysan5 <raysan5@gmail.com>2015-09-02 01:07:16 +0200
commite28fef6ee0a1a35171e27cde6bbfd7bc4025dc4a (patch)
tree320de8cb75ab5a9857478cf5e60bf9a22d720cf7
parent9a578c59624f671418a1f3b046b6b09aa4233909 (diff)
downloadraylib-e28fef6ee0a1a35171e27cde6bbfd7bc4025dc4a.tar.gz
raylib-e28fef6ee0a1a35171e27cde6bbfd7bc4025dc4a.zip
Reviewed examples
-rw-r--r--examples/core_3d_camera_first_person.c4
-rw-r--r--examples/core_basic_window_web.c20
-rw-r--r--examples/models_obj_loading.c11
3 files changed, 14 insertions, 21 deletions
diff --git a/examples/core_3d_camera_first_person.c b/examples/core_3d_camera_first_person.c
index cd37f873..aa947c3c 100644
--- a/examples/core_3d_camera_first_person.c
+++ b/examples/core_3d_camera_first_person.c
@@ -27,7 +27,7 @@ int main()
// Generates some random columns
float heights[MAX_COLUMNS];
- Vector3 positions[MAX_COLUMNS] = { 0.0, 2.5, 0.0 };
+ Vector3 positions[MAX_COLUMNS];
Color colors[MAX_COLUMNS];
for (int i = 0; i < MAX_COLUMNS; i++)
@@ -76,7 +76,7 @@ int main()
DrawText("First person camera default controls:", 20, 20, 10, GRAY);
DrawText("- Move with keys: W, A, S, D", 40, 50, 10, DARKGRAY);
- DrawText("- Mouse move to lokk around", 40, 70, 10, DARKGRAY);
+ DrawText("- Mouse move to look around", 40, 70, 10, DARKGRAY);
EndDrawing();
//----------------------------------------------------------------------------------
diff --git a/examples/core_basic_window_web.c b/examples/core_basic_window_web.c
index 65650b1a..1ecb22f3 100644
--- a/examples/core_basic_window_web.c
+++ b/examples/core_basic_window_web.c
@@ -1,26 +1,22 @@
/*******************************************************************************************
*
-* raylib [core] example - Basic window
+* raylib [core] example - Basic window (adapted for HTML5 platform)
*
-* Welcome to raylib!
+* This example is prepared to compile for PLATFORM_WEB, PLATFORM_DESKTOP and PLATFORM_RPI
+* As you will notice, code structure is slightly diferent to the other examples...
+* To compile it for PLATFORM_WEB just uncomment #define PLATFORM_WEB at beginning
*
-* To test examples, just press F6 and execute raylib_compile_execute script
-* Note that compiled executable is placed in the same folder as .c file
-*
-* You can find all basic examples on C:\raylib\raylib\examples folder or
-* raylib official webpage: www.raylib.com
-*
-* Enjoy using raylib. :)
-*
-* This example has been created using raylib 1.0 (www.raylib.com)
+* This example has been created using raylib 1.3 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* Copyright (c) 2014 Ramon Santamaria (@raysan5)
+* Copyright (c) 2015 Ramon Santamaria (@raysan5)
*
********************************************************************************************/
#include "raylib.h"
+//#define PLATFORM_WEB
+
#if defined(PLATFORM_WEB)
#include <emscripten/emscripten.h>
#endif
diff --git a/examples/models_obj_loading.c b/examples/models_obj_loading.c
index ef024356..f508e7ba 100644
--- a/examples/models_obj_loading.c
+++ b/examples/models_obj_loading.c
@@ -23,8 +23,8 @@ int main()
// Define the camera to look into our 3d world
Camera camera = {{ 3.0, 3.0, 3.0 }, { 0.0, 1.5, 0.0 }, { 0.0, 1.0, 0.0 }};
- Texture2D texture = LoadTexture("resources/model/dwarf_diffuse.png"); // Load model texture
- Model dwarf = LoadModel("resources/model/dwarf.obj"); // Load OBJ model
+ Model dwarf = LoadModel("resources/model/_dwarf.obj"); // Load OBJ model
+ Texture2D texture = LoadTexture("resources/model/_dwarf_diffuse.png"); // Load model texture
SetModelTexture(&dwarf, texture); // Bind texture to model
Vector3 position = { 0.0, 0.0, 0.0 }; // Set model position
@@ -36,10 +36,7 @@ int main()
{
// Update
//----------------------------------------------------------------------------------
- if (IsKeyDown(KEY_LEFT)) position.x -= 0.2;
- if (IsKeyDown(KEY_RIGHT)) position.x += 0.2;
- if (IsKeyDown(KEY_UP)) position.z -= 0.2;
- if (IsKeyDown(KEY_DOWN)) position.z += 0.2;
+ //...
//----------------------------------------------------------------------------------
// Draw
@@ -54,7 +51,7 @@ int main()
DrawGrid(10.0, 1.0); // Draw a grid
- DrawGizmo(position); // Draw gizmo
+ DrawGizmo(position); // Draw gizmo
End3dMode();