Forssim

Merge lp:~par-hellstrom/forssim/exampleFix into lp:forssim

  1. exampleFix
  2. Merge into development
Proposed by parhe
Status: Merged
Merged at revision: not available
Proposed branch: lp:~par-hellstrom/forssim/exampleFix
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~par-hellstrom/forssim/exampleFix
Reviewer Review Type Date Requested Status
Martin Flodin Approve
Review via email: mp+10154@code.launchpad.net
To post a comment you must log in.
Revision history for this message
parhe (par-hellstrom) wrote :

Fixed some bugs in the example x3d files

Revision history for this message
Martin Flodin (mflodin) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/x3d/drillable_cylinder.x3d'
2--- examples/x3d/drillable_cylinder.x3d 2009-05-20 08:49:21 +0000
3+++ examples/x3d/drillable_cylinder.x3d 2009-08-14 13:48:02 +0000
4@@ -95,7 +95,9 @@
5 expert go through the exercise and record in which order different parts are drilled. -->
6 <DrillingStepsNode DEF='DS'>
7 <VolumeModel containerField="volumeModelField" USE="VM" />
8- </DrillingStepsNode>
9+ <MaterialSegmentationModel containerField="materialSegmentationModelField" USE="SM" />
10+ <ForbiddenSegmentationModel containerField="forbiddenSegmentationModelField" USE="FM" />
11+ </DrillingStepsNode>
12
13
14 <!-- ADrillForce allows you too haptically render the cylinder. It basically works like the Archimedes' Principle
15
16=== modified file 'examples/x3d/mousedrill_cylinder.x3d'
17--- examples/x3d/mousedrill_cylinder.x3d 2009-05-20 23:21:47 +0000
18+++ examples/x3d/mousedrill_cylinder.x3d 2009-08-14 13:48:02 +0000
19@@ -98,7 +98,9 @@
20 expert go through the exercise and record in which order different parts are drilled. -->
21 <DrillingStepsNode DEF='DS'>
22 <VolumeModel containerField="volumeModelField" USE="VM" />
23- </DrillingStepsNode>
24+ <MaterialSegmentationModel containerField="materialSegmentationModelField" USE="SM" />
25+ <ForbiddenSegmentationModel containerField="forbiddenSegmentationModelField" USE="FM" />
26+ </DrillingStepsNode>
27
28
29
30
31=== modified file 'examples/x3d/touchable_cylinder.x3d'
32--- examples/x3d/touchable_cylinder.x3d 2009-05-20 08:49:21 +0000
33+++ examples/x3d/touchable_cylinder.x3d 2009-08-14 13:48:02 +0000
34@@ -95,7 +95,9 @@
35 expert go through the exercise and record in which order different parts are drilled. -->
36 <DrillingStepsNode DEF='DS'>
37 <VolumeModel containerField="volumeModelField" USE="VM" />
38- </DrillingStepsNode>
39+ <MaterialSegmentationModel containerField="materialSegmentationModelField" USE="SM" />
40+ <ForbiddenSegmentationModel containerField="forbiddenSegmentationModelField" USE="FM" />
41+ </DrillingStepsNode>
42
43
44 <!-- ADrillForce allows you too haptically render the cylinder. It basically works like the Archimedes' Principle

Subscribers

People subscribed via source and target branches

to all changes: