Skip to content
This repository has been archived by the owner on Dec 16, 2021. It is now read-only.

get rid of tga #275

Merged
merged 1 commit into from
May 26, 2020
Merged

get rid of tga #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/examples3d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
end
@cell "Textured Mesh" [mesh, texture, cat] begin
using FileIO
catmesh = FileIO.load(MakieGallery.assetpath("cat.obj"))
mesh(catmesh, color = MakieGallery.loadasset("diffusemap.tga"))
catmesh = MakieGallery.loadasset("cat.obj")
mesh(catmesh, color = MakieGallery.loadasset("diffusemap.png"))
end
@cell "Load Mesh" [mesh, cat] begin
mesh(MakieGallery.loadasset("cat.obj"))
Expand Down
2 changes: 1 addition & 1 deletion examples/interactive.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ end
# Set up textured mesh + light source
catmesh = FileIO.load(MakieGallery.assetpath("cat.obj"))
scene3 = mesh(
catmesh, color = MakieGallery.loadasset("diffusemap.tga"),
catmesh, color = MakieGallery.loadasset("diffusemap.png"),
ambient = la, diffuse = ld, specular = ls, shininess = shininess,
lightposition = lp
)
Expand Down