Pārlūkot izejas kodu

meshviewer name straightening again

undefined
Benjamin ‘Touky’ Huet Sam Hocevar <sam@hocevar.net> pirms 11 gadiem
vecāks
revīzija
8b793bcd36
8 mainītis faili ar 14 papildinājumiem un 13 dzēšanām
  1. +2
    -1
      src/platform/emscripten/lol_shell.html
  2. +0
    -0
      test/javascript/naclloading.js
  3. +0
    -0
      test/javascript/progressstatus.js
  4. +0
    -0
      test/javascript/typedictionnary.js
  5. +0
    -0
      test/javascript/utils.js
  6. +2
    -2
      test/meshviewer.em.html
  7. +5
    -5
      test/meshviewer.index.html
  8. +5
    -5
      test/meshviewer.vcxproj

+ 2
- 1
src/platform/emscripten/lol_shell.html Parādīt failu

@@ -38,7 +38,7 @@ canvas.emscripten
</head>

<body>
<div class="emscripten_border">
<div class="emscripten_border" id="id_div_embed_data">
<canvas class="emscripten" id="id_cvas_render" oncontextmenu="event.preventDefault()"></canvas>
</div>

@@ -172,6 +172,7 @@ canvas.emscripten
<!-- -->

<script type='text/javascript'>
//This call NEEDS TO BE after the .js include, because "cwrap" is set in it.
Module.do_wrapup();

//Parent communication datas


test/naclloading.js → test/javascript/naclloading.js Parādīt failu


test/progressstatus.js → test/javascript/progressstatus.js Parādīt failu


test/typedictionnary.js → test/javascript/typedictionnary.js Parādīt failu


test/utils.js → test/javascript/utils.js Parādīt failu


+ 2
- 2
test/meshviewer.em.html Parādīt failu

@@ -142,7 +142,7 @@ canvas.emscripten
Module.setStatus('All downloads complete.', 1, 1);
},
//IMPORTANT : This is the C -> Javascript wraping, add your functions list here.
wrapup_list: [ {src_obj: null, func_name: 'DoSendMessage', c_func_name: 'C_Send', return_var: 'number', args: ['number', 'string'] } ],
wrapup_list: [ {src_obj: null, func_name: 'DoSendMessage', c_func_name: 'C_Send', return_var: 'number', args: ['string'] } ],
do_wrapup: function()
{
for (var i = 0; i < this.wrapup_list.length; i++)
@@ -158,7 +158,7 @@ canvas.emscripten
//Module <-> Page communication setup
SendMessage:function(message)
{
this.DoSendMessage(0, message);
this.DoSendMessage(message);
},
ModuleSendMessage:function(message)
{


+ 5
- 5
test/meshviewer.index.html Parādīt failu

@@ -127,19 +127,19 @@ function machinchose() { return 'test machin '; }
function IsUsingNaCl() { return window.chrome; }
</script>

<script src="./utils.js"></script>
<script src="./progressstatus.js"></script>
<script src="./javascript/utils.js"></script>
<script src="./javascript/progressstatus.js"></script>
<script type="text/javascript">
//Used by typedictionnary.js
function GetCmdDictionnary() { return CodeDictionnary[g_code_id]; }
g_code_id = 1;
</script>
<script src="./typedictionnary.js"></script>
<script src="./javascript/typedictionnary.js"></script>
<!-- Init Scene setup dictionnary -->
<script type="text/javascript">
CodeDictionnary[g_code_id--] = new TypeDictionnary("SceneSetup");
</script>
<script src="./scenesetup.js"></script>
<script src="./scenesetupdictionnary.js"></script>
<!-- Init Easy mesh dictionnary -->
<script type="text/javascript">
CodeDictionnary[g_code_id] = new TypeDictionnary("EasyMesh");
@@ -208,7 +208,7 @@ function machinchose() { return 'test machin '; }
//NaCl Specific
if (IsUsingNaCl())
{
DynLoadFile("naclloading.js");
DynLoadFile("./javascript/naclloading.js");
g_frame_embed.src = 'meshviewer.nacl.html';
}
else


+ 5
- 5
test/meshviewer.vcxproj Parādīt failu

@@ -85,19 +85,19 @@
<None Include="easymeshdictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
<None Include="naclloading.js">
<None Include="scenesetupdictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
<None Include="progressstatus.js">
<None Include="javascript/naclloading.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
<None Include="utils.js">
<None Include="javascript/progressstatus.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
<None Include="scenesetupdictionnary.js">
<None Include="javascript/utils.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
<None Include="typedictionnary.js">
<None Include="javascript/typedictionnary.js">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
</ItemGroup>


Notiek ielāde…
Atcelt
Saglabāt