Skip to content

Commit

Permalink
Merge branch 'master' into hflatval/simplify-isclipped
Browse files Browse the repository at this point in the history
  • Loading branch information
haakonflatval-cognite authored Aug 12, 2024
2 parents e400773 + d079752 commit a33ab3e
Show file tree
Hide file tree
Showing 206 changed files with 11,464 additions and 5,908 deletions.
13 changes: 3 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,8 @@ target
**/yarn-error.log*

# yarn
documentation/.yarn/
documentation/docs/.yarn/
viewer/.yarn/*
!/viewer/.yarn/releases
!/viewer/.yarn/releases/*

react-components/.yarn/*
!/react-components/.yarn/releases
!/react-components/.yarn/releases/*
**/.yarn/cache
**/.yarn/install-state.gz

**/.env
**/.cdf-env.json
Expand Down Expand Up @@ -61,4 +54,4 @@ examples/public/
documentation/.docusaurus
documentation/generated
documentation/docs/api
/react-components/stories/public/cadModel
/react-components/stories/public/cadModel
6 changes: 5 additions & 1 deletion documentation/docs/examples/controlsmodes.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@ Default value is `false`.
Example of setting different camera controls options:

```jsx runnable
// import { isDefaultCameraManager } from '@cognite/reveal';

const newControlsOptions = {
mouseWheelAction: 'zoomToCursor',
changeCameraTargetOnClick: true,
};

viewer.cameraManager.setCameraControlsOptions(newControlsOptions);
if (isDefaultCameraManager(viewer.cameraManager)) {
viewer.cameraManager.setCameraControlsOptions(newControlsOptions);
}
```
2 changes: 1 addition & 1 deletion documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"copyfiles": "2.4.1",
"docusaurus-plugin-typedoc": "1.0.1",
"replace": "1.2.2",
"rimraf": "5.0.7",
"rimraf": "6.0.0",
"typedoc": "0.26.2",
"typedoc-plugin-markdown": "4.1.0",
"typedoc-plugin-no-inherit": "1.4.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 53 additions & 36 deletions documentation/yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a33ab3e

Please sign in to comment.