diff options
| -rw-r--r-- | resources/lua/slides.lua | 4 | ||||
| -rw-r--r-- | samplecode/SampleLua.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/resources/lua/slides.lua b/resources/lua/slides.lua index 9d61a87273..eb34dd8138 100644 --- a/resources/lua/slides.lua +++ b/resources/lua/slides.lua @@ -1,7 +1,7 @@ gShowBounds = false gUseBlurInTransitions = false -gPath = "resources/" +gPath = "resources/lua/" function load_file(file) local prev_path = package.path @@ -12,7 +12,7 @@ end load_file("slides_utils") -gSlides = parse_file(io.open("resources/slides_content2.lua", "r")) +gSlides = parse_file(io.open("resources/lua/slides_content2.lua", "r")) function make_rect(l, t, r, b) return { left = l, top = t, right = r, bottom = b } diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp index 2c94e81f76..7b04fd073b 100644 --- a/samplecode/SampleLua.cpp +++ b/samplecode/SampleLua.cpp @@ -57,8 +57,7 @@ public: if (nullptr == fLua) { fLua = new SkLua; - SkString str = GetResourcePath(LUA_FILENAME); - sk_sp<SkData> data(SkData::MakeFromFileName(str.c_str())); + sk_sp<SkData> data = GetResourceAsData(LUA_FILENAME); if (data) { fLua->runCode(data->data(), data->size()); this->setImageFilename(fLua->get()); |