-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #487 from chrismbirmingham/lms-rebased
[Semio] LMS Update
- Loading branch information
Showing
44 changed files
with
3,200 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule ammo.js
added at
a8b359
Submodule libwallaby
updated
8 files
+5 −5 | CMakeLists.txt | |
+4 −18 | binding/python/CMakeLists.txt | |
+0 −0 | module/camera/dependencies/zlib/@ | |
+2 −2 | module/camera/dependencies/zlib/CMakeLists.txt | |
+82 −41 | module/camera/src/camera.cpp | |
+1,675 −1,968 | module/camera/src/cap_v4l.cpp | |
+0 −14 | module/create/CMakeLists.txt | |
+17 −43 | module/create/src/create.cpp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import * as React from 'react'; | ||
|
||
export default () => { | ||
return ( | ||
<div> | ||
<h1>Asset Viewer</h1> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import * as React from 'react'; | ||
import * as ReactDom from 'react-dom'; | ||
|
||
|
||
import { Provider as StyletronProvider } from "styletron-react"; | ||
import { Client as Styletron } from "styletron-engine-atomic"; | ||
|
||
import { Provider as ReduxProvider } from 'react-redux'; | ||
import store from '../state'; | ||
import AssetViewerPage from './AssetViewerPage'; | ||
|
||
const reactRoot = document.getElementById('reactRoot'); | ||
|
||
const engine = new Styletron({ prefix: 'style' }); | ||
|
||
ReactDom.render( | ||
<StyletronProvider value={engine} debugAfterHydration> | ||
<ReduxProvider store={store}> | ||
<AssetViewerPage /> | ||
</ReduxProvider> | ||
</StyletronProvider>, | ||
reactRoot | ||
); |
Oops, something went wrong.