Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/robot-scene'
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewMusser committed Nov 29, 2023
2 parents 0aef27f + 2e28a89 commit 222bd49
Show file tree
Hide file tree
Showing 11 changed files with 1,100 additions and 13 deletions.
8 changes: 8 additions & 0 deletions example/HMI/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@

<!-- Make the entire app run from within the node modules folder -->
<base href="../node_modules/">
<script type="importmap">
{
"imports": {
"three": "./three/build/three.module.js",
"three/addons/": "./three/examples/jsm/"
}
}
</script>

<link href="bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">

Expand Down
7 changes: 2 additions & 5 deletions example/HMI/app/views/main.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,5 @@ don't worry about this -->
DirectoryBrowserWindow
{{tmplit 'DirectoryBrowserWindow' data-var-name='tmplitTest:f.in.cwd' data-var-name-files='tmplitTest:Directory' data-var-name-willopen='tmplitTest:f.in.refresh' style='height:300px'}}


<!-- ask katie or jack
{{tmplit 'NumGrid'}}-->

<!-- reach out to katie about building tmplits -->
RobotScene
{{tmplit 'RobotScene' robotFile='./@loupeteam/tmplits-robotscene/Robot.glb' style="width:300px; height:300px" onrender="tmplit_test_UpdateScene" lightColor='0xCC6666' lightIntensity='1.5'}}
Loading

0 comments on commit 222bd49

Please sign in to comment.