Commit c9cbc155 authored by Janez's avatar Janez

Merge branch 'muse' of /home/git/repositories/kt/mothra

parents e277214e 27fd9e41
......@@ -272,6 +272,20 @@ def MUSE_string_to_file_finished_V3(postdata, input_dict, output_dict):
fileURL = fqdn + postdata.get('fileURL')[0]
return {'fileURL': fileURL}
#end
def MUSE_view_xml_V3(input_dict):
return {'xml_data': input_dict.get('xml_data', None)}
def MUSE_virtual_environment_demonstrator_tuk_V3(input_dict):
return {'mappingLink': str(input_dict['mappingLink']), 'unityLink': input_dict['unityLink']}
def MUSE_virtual_environment_demonstrator_tuk_local_V3(input_dict):
return {'mappingLink': str(input_dict['mappingLink']), 'unityLink': input_dict['unityLink']}
......@@ -12,8 +12,8 @@
"image": "",
"description": "Local copy of the 3D demonstrator for the Tuk the Hunter children story",
"static_image": "",
"action": "MUSE_virtual_environment_demonstrator_tuk_local",
"visualization_view": "MUSE_virtual_environment_demonstrator_tuk_local",
"action": "MUSE_virtual_environment_demonstrator_tuk_local_V3",
"visualization_view": "MUSE_virtual_environment_demonstrator_tuk_local_V3",
"streaming_visualization_view": "",
"post_interact_action": "",
"wsdl_method": "",
......
......@@ -12,8 +12,8 @@
"image": "",
"description": "Displays XML in a modal window",
"static_image": "",
"action": "MUSE_view_xml",
"visualization_view": "MUSE_view_xml",
"action": "MUSE_view_xml_V3",
"visualization_view": "MUSE_view_xml_V3",
"streaming_visualization_view": "",
"post_interact_action": "",
"wsdl_method": "",
......
......@@ -12,8 +12,8 @@
"image": "",
"description": "3D demonstrator for the Tuk the Hunter children story",
"static_image": "",
"action": "MUSE_virtual_environment_demonstrator_tuk",
"visualization_view": "MUSE_virtual_environment_demonstrator_tuk",
"action": "MUSE_virtual_environment_demonstrator_tuk_V3",
"visualization_view": "MUSE_virtual_environment_demonstrator_tuk_V3",
"streaming_visualization_view": "",
"post_interact_action": "",
"wsdl_method": "",
......
......@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity Web Player | Tuk the Hunter - Text Parsing</title>
<title>Unity Web Player | Tuk the Hunter - Leuven Text Parsing</title>
<script type='text/javascript' src='https://ssl-webplayer.unity3d.com/download_webplayer-3.x/3.0/uo/jquery.min.js'></script>
<script type="text/javascript">
<!--
......@@ -15,8 +15,8 @@
<script type="text/javascript">
<!--
var config = {
width: 960,
height: 600,
width: 1280,
height: 720,
params: { enableDebugging:"0" }
};
......@@ -85,7 +85,7 @@
}
div.content {
margin: auto;
width: 960px;
width: 1280px;
}
div.broken,
div.missing {
......@@ -109,14 +109,14 @@
}
div#unityPlayer {
cursor: default;
height: 600px;
width: 960px;
height: 720px;
width: 1280px;
}
-->
</style>
</head>
<body>
<p class="header"><span>Unity Web Player | </span>Tuk the Hunter - Text Parsing</p>
<p class="header"><span>Unity Web Player | </span>Tuk the Hunter - Leuven Text Parsing</p>
<div class="content">
<div id="unityPlayer">
<div class="missing">
......
......@@ -17,7 +17,7 @@ def MUSE_view_xmlOLD(request, input_dict, output_dict, widget):
{'widget': widget, 'xml_data': input_dict['xml_data']})
def MUSE_view_xml(request, input_dict, output_dict, widget):
def MUSE_view_xml_V3(request, input_dict, output_dict, widget):
from mothra.settings import MEDIA_ROOT
from workflows.helpers import ensure_dir
......@@ -49,7 +49,7 @@ def MUSE_virtual_environment_visualization(request, input_dict, output_dict, wid
})
def MUSE_virtual_environment_demonstrator_tuk(request, input_dict, output_dict, widget):
def MUSE_virtual_environment_demonstrator_tuk_V3(request, input_dict, output_dict, widget):
from urllib import urlencode
params = urlencode({'filename': str(input_dict['mappingLink'])})
unityLink = '%s?%s' % (str(input_dict['unityLink']), params)
......@@ -61,7 +61,7 @@ def MUSE_virtual_environment_demonstrator_tuk(request, input_dict, output_dict,
)
def MUSE_virtual_environment_demonstrator_tuk_local(request, input_dict, output_dict, widget):
def MUSE_virtual_environment_demonstrator_tuk_local_V3(request, input_dict, output_dict, widget):
from urllib import urlencode
params = urlencode({'filename': str(input_dict['mappingLink'])})
unityLink = '%s?%s' % (str(input_dict['unityLink']), params)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment