summaryrefslogtreecommitdiffhomepage
path: root/examples/web/models/models_cubicmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'examples/web/models/models_cubicmap.c')
-rw-r--r--examples/web/models/models_cubicmap.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/examples/web/models/models_cubicmap.c b/examples/web/models/models_cubicmap.c
index 9f87992..a4cb271 100644
--- a/examples/web/models/models_cubicmap.c
+++ b/examples/web/models/models_cubicmap.c
@@ -18,14 +18,14 @@
//----------------------------------------------------------------------------------
// Global Variables Definition
//----------------------------------------------------------------------------------
-int screenWidth = 800;
-int screenHeight = 450;
+const int screenWidth = 800;
+const int screenHeight = 450;
// Define the camera to look into our 3d world
Camera camera = {{ 16.0f, 14.0f, 16.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
-Texture2D cubicmap;
-Model map;
+Texture2D cubicmap = { 0 };
+Model model = { 0 };
Vector3 mapPosition = { -16.0f, 0.0f, -8.0f }; // Set model position
@@ -35,7 +35,7 @@ Vector3 mapPosition = { -16.0f, 0.0f, -8.0f }; // Set model posi
void UpdateDrawFrame(void); // Update and Draw one frame
//----------------------------------------------------------------------------------
-// Main Enry Point
+// Program Main Entry Point
//----------------------------------------------------------------------------------
int main(void)
{
@@ -45,16 +45,16 @@ int main(void)
Image image = LoadImage("resources/cubicmap.png"); // Load cubicmap image (RAM)
cubicmap = LoadTextureFromImage(image); // Convert image to texture to display (VRAM)
-
+
Mesh mesh = GenMeshCubicmap(image, (Vector3){ 1.0f, 1.0f, 1.0f });
- map = LoadModelFromMesh(mesh);
-
+ model = LoadModelFromMesh(mesh);
+
// NOTE: By default each cube is mapped to one part of texture atlas
Texture2D texture = LoadTexture("resources/cubicmap_atlas.png"); // Load map texture
- map.material.maps[MAP_DIFFUSE].texture = texture; // Set map diffuse texture
+ model.materials[0].maps[MAP_DIFFUSE].texture = texture; // Set map diffuse texture
UnloadImage(image); // Unload cubesmap image from RAM, already uploaded to VRAM
-
+
SetCameraMode(camera, CAMERA_ORBITAL); // Set an orbital camera mode
#if defined(PLATFORM_WEB)
@@ -62,7 +62,7 @@ int main(void)
#else
SetTargetFPS(60); // Set our game to run at 60 frames-per-second
//--------------------------------------------------------------------------------------
-
+
// Main game loop
while (!WindowShouldClose()) // Detect window close button or ESC key
{
@@ -74,7 +74,7 @@ int main(void)
//--------------------------------------------------------------------------------------
UnloadTexture(cubicmap); // Unload cubicmap texture
UnloadTexture(texture); // Unload map texture
- UnloadModel(map); // Unload map model
+ UnloadModel(model); // Unload map model
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
@@ -98,15 +98,15 @@ void UpdateDrawFrame(void)
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
+
+ DrawModel(model, mapPosition, 1.0f, WHITE);
- DrawModel(map, mapPosition, 1.0f, WHITE);
+ EndMode3D();
- End3dMode();
-
DrawTextureEx(cubicmap, (Vector2){ screenWidth - cubicmap.width*4 - 20, 20 }, 0.0f, 4.0f, WHITE);
DrawRectangleLines(screenWidth - cubicmap.width*4 - 20, 20, cubicmap.width*4, cubicmap.height*4, GREEN);
-
+
DrawText("cubicmap image used to", 658, 90, 10, GRAY);
DrawText("generate map 3d model", 658, 104, 10, GRAY);