salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing template bugs

Browse Source
This commit is contained in:
Vladislav Khorev 2013-11-02 15:35:50 +00:00
parent 144acdd633
commit 73fc81572e
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Templates/SalmonUniversalTemplate/assets/bt_box_yellow.tga
View File

Binary file not shown.

2
Templates/SalmonUniversalTemplate/assets/model.xml
View File

@ -1,6 +1,6 @@
<Model>
<SamplerMap>
<Sampler name="Texture" value="bt_box_yellow_.bmp"/>
<Sampler name="Texture" value="bt_box_yellow.jpg"/>
</SamplerMap>
<Vec3ArrMap>
<Vec3Arr name="vPosition">

2
Templates/SalmonUniversalTemplate/jni/main_code.cpp
View File

@ -54,7 +54,7 @@ void TMyApplication::InnerInit()
ResourceManager->LightManager.SetLightDirection(vec3(-1,0,-1));
ResourceManager->LightManager.SetLightColor(vec4(1,0,0,1));
ResourceManager->TexList.AddTexture("bt_box_yellow.bmp");
ResourceManager->TexList.AddTexture("bt_box_yellow.jpg");
ResourceManager->FlexModelManager.LoadModelFromXml("model.xml");
FlexModel = ResourceManager->FlexModelManager.InstanciateModel("model.xml");