Просмотр исходного кода

small MeshViewer tweak

undefined
Benjamin ‘Touky’ Huet Sam Hocevar <sam@hocevar.net> 9 лет назад
Родитель
Сommit
3ef2d6d31f
3 измененных файлов: 23 добавлений и 20 удалений
  1. +3
    -0
      doc/samples/meshviewer/meshviewer.cpp
  2. +1
    -1
      doc/samples/meshviewer/meshviewer.h
  3. +19
    -19
      doc/samples/meshviewer/meshviewer.vcxproj

+ 3
- 0
doc/samples/meshviewer/meshviewer.cpp Просмотреть файл

@@ -295,6 +295,7 @@ void MeshViewer::TickGame(float seconds)
m_menu_mesh_names_char << m_menu_mesh_names_str[i].C();

ImGuiIO& io = ImGui::GetIO();
//CAMERA UI ---------------------------------------------------------------
ImGui::Begin("Camera Setup" /*, &default_open, ImGuiWindowFlags_AlwaysAutoResize*/);
{
ImGui::Text("Hello, world!");
@@ -305,6 +306,8 @@ void MeshViewer::TickGame(float seconds)
ImGui::SliderFloat("Cam Distance", &m_menu_cam_pos.x, 0.1f, 30.f);
ImGui::SliderFloat("Cam H-axis", &m_menu_cam_pos.y, -180.f, 180.f);
ImGui::SliderFloat("Cam V-axis", &m_menu_cam_pos.z, -89.f, 89.f);
ImGui::Combo("Scene Setup", &m_menu_mesh_idx, (const char**)m_menu_mesh_names_char.data(), (int)m_menu_mesh_names_char.count());

ImGui::ListBox("Meshes", &m_menu_mesh_idx, (const char**)m_menu_mesh_names_char.data(), (int)m_menu_mesh_names_char.count());
//ImGui::ListBox()
}


+ 1
- 1
doc/samples/meshviewer/meshviewer.h Просмотреть файл

@@ -218,7 +218,7 @@ class MeshViewer : public WorldEntity
{
typedef WorldEntity super;
public:
MeshViewer(char const *file_name = "data/meshviewer.easymesh.lua");
MeshViewer(char const *file_name = "../data/meshviewer.easymesh.lua");
~MeshViewer();

void Start();


+ 19
- 19
doc/samples/meshviewer/meshviewer.vcxproj Просмотреть файл

@@ -35,8 +35,8 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="meshviewer/meshviewer.cpp" />
<ClCompile Include="meshviewer/scenesetup.cpp" />
<ClCompile Include="meshviewer.cpp" />
<ClCompile Include="scenesetup.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
@@ -50,64 +50,64 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="data\mesh-buffer.txt">
<None Include="../data/mesh-buffer.txt">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="data\meshviewer.easymesh.lua">
<None Include="..\data\meshviewer.easymesh.lua">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="data\meshviewer.init.lua">
<None Include="..\data\meshviewer.init.lua">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/meshviewer.index.html">
<None Include="meshviewer.index.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/meshviewer.nacl.html">
<None Include="meshviewer.nacl.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/meshviewer.em.html">
<None Include="meshviewer.em.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/meshviewer.nacl.nmf">
<None Include="meshviewer.nacl.nmf">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/easymeshdictionnary.js">
<None Include="easymeshdictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="meshviewer/scenesetupdictionnary.js">
<None Include="scenesetupdictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="javascript/naclloading.js">
<None Include="../javascript/naclloading.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="javascript/progressstatus.js">
<None Include="../javascript/progressstatus.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="javascript/utils.js">
<None Include="../javascript/utils.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
<None Include="javascript/typedictionnary.js">
<None Include="../javascript/typedictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</None>
</ItemGroup>
<ItemGroup>
<LolFxCompile Include="data/shinyfur.lolfx" />
<LolFxCompile Include="data/shinymvtexture.lolfx" />
<LolFxCompile Include="shinyfur.lolfx" />
<LolFxCompile Include="shinymvtexture.lolfx" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="meshviewer/meshviewer.h" />
<ClInclude Include="meshviewer/scenesetup.h" />
<ClInclude Include="meshviewer.h" />
<ClInclude Include="scenesetup.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}</ProjectGuid>


Загрузка…
Отмена
Сохранить