diff options
| author | Ray <[email protected]> | 2016-11-24 17:26:07 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-11-24 17:26:07 +0100 |
| commit | 17f09cb03484a408cdd50a3d2e4d6604bb1f4c70 (patch) | |
| tree | 51e909c419de9625f1beaaca44696857a600e8d5 /examples/shaders_model_shader.lua | |
| parent | 05f68c22d5c8d8f7c4254ae47700318e21709887 (diff) | |
| parent | a81dfabf863c512044b246e23aaf43489d2fa1ac (diff) | |
| download | raylib-1.6.0.tar.gz raylib-1.6.0.zip | |
Merge pull request #198 from raysan5/develop1.6.0
Develop branch integration
Diffstat (limited to 'examples/shaders_model_shader.lua')
| -rw-r--r-- | examples/shaders_model_shader.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/shaders_model_shader.lua b/examples/shaders_model_shader.lua index d1436a7e..38f0fd30 100644 --- a/examples/shaders_model_shader.lua +++ b/examples/shaders_model_shader.lua @@ -39,9 +39,7 @@ dwarf.material.texDiffuse = texture -- Bind texture to model local position = Vector3(0.0, 0.0, 0.0) -- Set model position -- Setup orbital camera -SetCameraMode(CameraMode.ORBITAL) -- Set an orbital camera mode -SetCameraPosition(camera.position) -- Set internal camera position to match our camera position -SetCameraTarget(camera.target) -- Set internal camera target to match our camera target +SetCameraMode(camera, CameraMode.ORBITAL) -- Set an orbital camera mode SetTargetFPS(60) -- Set our game to run at 60 frames-per-second ------------------------------------------------------------------------------------------- @@ -50,7 +48,7 @@ SetTargetFPS(60) -- Set our game to run at 60 frames-pe while not WindowShouldClose() do -- Detect window close button or ESC key -- Update --------------------------------------------------------------------------------------- - camera = UpdateCamera(camera) -- Update internal camera and our camera + camera = UpdateCamera(camera) -- Update camera --------------------------------------------------------------------------------------- -- Draw |