From ab3a16fb91632f024b3557a8148c7bbd131b9ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20=E2=80=98Touky=E2=80=99=20Huet?=
<huet.benjamin@gmail.com>
Date: Tue, 1 Oct 2013 21:04:09 +0000
Subject: [PATCH] meshviewer files name straightening
---
..._dictionnary.js => easymeshdictionnary.js} | 0
...{meshviewer_em.html => meshviewer.em.html} | 0
...iewer_index.html => meshviewer.index.html} | 26 ++++++++++-------
...hviewer_nacl.html => meshviewer.nacl.html} | 2 +-
...eshviewer_nacl.nmf => meshviewer.nacl.nmf} | 0
test/meshviewer.vcxproj | 29 +++++++++++++------
test/{nacl_loading.js => naclloading.js} | 0
.../{progress_status.js => progressstatus.js} | 0
...scenesetup.js => scenesetupdictionnary.js} | 1 -
...type_dictionnary.js => typedictionnary.js} | 0
10 files changed, 37 insertions(+), 21 deletions(-)
rename test/{easy_mesh_dictionnary.js => easymeshdictionnary.js} (100%)
rename test/{meshviewer_em.html => meshviewer.em.html} (100%)
rename test/{meshviewer_index.html => meshviewer.index.html} (94%)
rename test/{meshviewer_nacl.html => meshviewer.nacl.html} (88%)
rename test/{meshviewer_nacl.nmf => meshviewer.nacl.nmf} (100%)
rename test/{nacl_loading.js => naclloading.js} (100%)
rename test/{progress_status.js => progressstatus.js} (100%)
rename test/{scenesetup.js => scenesetupdictionnary.js} (88%)
rename test/{type_dictionnary.js => typedictionnary.js} (100%)
diff --git a/test/easy_mesh_dictionnary.js b/test/easymeshdictionnary.js
similarity index 100%
rename from test/easy_mesh_dictionnary.js
rename to test/easymeshdictionnary.js
diff --git a/test/meshviewer_em.html b/test/meshviewer.em.html
similarity index 100%
rename from test/meshviewer_em.html
rename to test/meshviewer.em.html
diff --git a/test/meshviewer_index.html b/test/meshviewer.index.html
similarity index 94%
rename from test/meshviewer_index.html
rename to test/meshviewer.index.html
index f069fc4a..09649f7c 100644
--- a/test/meshviewer_index.html
+++ b/test/meshviewer.index.html
@@ -125,21 +125,27 @@ function machinchose() { return 'test machin '; }
function GetiFrameDivEmbed() { return (!g_frame_embed) ? (null) : (g_frame_embed.contentWindow.GetDivEmbed()); }
function GetiFrameModuleVar() { return (!g_frame_embed) ? (null) : (g_frame_embed.contentWindow.GetEmbedModule()); }
function IsUsingNaCl() { return window.chrome; }
- function GetCmdDictionnary() { return CodeDictionnary[g_code_id]; }
</script>
<script src="./utils.js"></script>
-<script src="./progress_status.js"></script>
-<script src="./type_dictionnary.js"></script>
+<script src="./progressstatus.js"></script>
<script type="text/javascript">
- CodeDictionnary[0] = new TypeDictionnary("EasyMesh");
+ //Used by typedictionnary.js
+ function GetCmdDictionnary() { return CodeDictionnary[g_code_id]; }
+ g_code_id = 1;
</script>
-<script src="./easy_mesh_dictionnary.js"></script>
+<script src="./typedictionnary.js"></script>
+<!-- Init Scene setup dictionnary -->
<script type="text/javascript">
- g_code_id = 1;
- CodeDictionnary[1] = new TypeDictionnary("EasyMesh");
+ CodeDictionnary[g_code_id--] = new TypeDictionnary("SceneSetup");
</script>
<script src="./scenesetup.js"></script>
+<!-- Init Easy mesh dictionnary -->
+<script type="text/javascript">
+ CodeDictionnary[g_code_id] = new TypeDictionnary("EasyMesh");
+</script>
+<script src="./easymeshdictionnary.js"></script>
+<!-- Revert datas to normal -->
<script type="text/javascript">
g_code_id = 0;
</script>
@@ -202,11 +208,11 @@ function machinchose() { return 'test machin '; }
//NaCl Specific
if (IsUsingNaCl())
{
- DynLoadFile("nacl_loading.js");
- g_frame_embed.src = 'meshviewer_nacl.html';
+ DynLoadFile("naclloading.js");
+ g_frame_embed.src = 'meshviewer.nacl.html';
}
else
- g_frame_embed.src = 'meshviewer_em.html';
+ g_frame_embed.src = 'meshviewer.em.html';
g_frame_embed.onload = function() { VarInit(); }
diff --git a/test/meshviewer_nacl.html b/test/meshviewer.nacl.html
similarity index 88%
rename from test/meshviewer_nacl.html
rename to test/meshviewer.nacl.html
index a9b73960..16222c7c 100644
--- a/test/meshviewer_nacl.html
+++ b/test/meshviewer.nacl.html
@@ -8,7 +8,7 @@ function GetEmbedModule() { return document.getElementById('id_embed_nacl_modu
if (parent.IsUsingNaCl()) parent.NaClLoadingInit();
</script>
<div id="id_div_embed_data" style="left:0px;top:0px;position:absolute;">
- <embed name="name_embed_nacl_module" id="id_embed_nacl_module" width=770 height=200 src="meshviewer_nacl.nmf" type="application/x-nacl" />
+ <embed name="name_embed_nacl_module" id="id_embed_nacl_module" width=770 height=200 src="meshviewer.nacl.nmf" type="application/x-nacl" />
</div>
</body>
</html>
diff --git a/test/meshviewer_nacl.nmf b/test/meshviewer.nacl.nmf
similarity index 100%
rename from test/meshviewer_nacl.nmf
rename to test/meshviewer.nacl.nmf
diff --git a/test/meshviewer.vcxproj b/test/meshviewer.vcxproj
index edc4db5f..b3c01ad1 100644
--- a/test/meshviewer.vcxproj
+++ b/test/meshviewer.vcxproj
@@ -64,29 +64,40 @@
<None Include="data\mesh-buffer.txt">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</None>
- <None Include="easy_mesh_dictionnary.js">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </None>
<None Include="generated\location.hh" />
<None Include="generated\position.hh" />
<None Include="generated\scenesetup-parser.output" />
<None Include="generated\stack.hh" />
- <None Include="meshviewer_index.html">
+ <None Include="meshviewer.index.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
- <None Include="meshviewer_nacl.html">
+ <None Include="meshviewer.nacl.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
- <None Include="meshviewer_nacl.nmf">
+ <None Include="meshviewer.em.html">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
- <None Include="nacl_loading.js">
+ <None Include="meshviewer.nacl.nmf">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
- <None Include="progress_status.js" />
<None Include="scenesetup-parser.y" />
<None Include="scenesetup-scanner.l" />
- <None Include="type_dictionnary.js">
+ <None Include="easymeshdictionnary.js">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </None>
+ <None Include="naclloading.js">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </None>
+ <None Include="progressstatus.js">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </None>
+ <None Include="utils.js">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </None>
+ <None Include="scenesetupdictionnary.js">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </None>
+ <None Include="typedictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
</ItemGroup>
diff --git a/test/nacl_loading.js b/test/naclloading.js
similarity index 100%
rename from test/nacl_loading.js
rename to test/naclloading.js
diff --git a/test/progress_status.js b/test/progressstatus.js
similarity index 100%
rename from test/progress_status.js
rename to test/progressstatus.js
diff --git a/test/scenesetup.js b/test/scenesetupdictionnary.js
similarity index 88%
rename from test/scenesetup.js
rename to test/scenesetupdictionnary.js
index ff6b9920..cea00ef7 100644
--- a/test/scenesetup.js
+++ b/test/scenesetupdictionnary.js
@@ -1,7 +1,6 @@
//-------------------------------------------------------------------------
//Command vars operations
//-------------------------------------------------------------------------
-CmdVar("[ ]", ["Opens a new context,\nevery operations between the braces\nwill only be done to the vertices added\nsince the start of this context."]);
CmdVar("float", ["Fraction value", "0.0"]);
CmdVar("int", ["No decimal value", "0"]);
CmdVar("bool", ["Boolean value", "true/false", "1/0"]);
diff --git a/test/type_dictionnary.js b/test/typedictionnary.js
similarity index 100%
rename from test/type_dictionnary.js
rename to test/typedictionnary.js