- Timestamp:
- 07/21/17 11:29:08 (7 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 14708-14709,14971,14978-14979,15167,15230,15233,15240-15241,15276
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.BinPacking.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.BinPacking.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.BinPacking.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.BinPacking.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.BinPacking.Views 6917-7005 /branches/BinPackingExtension/HeuristicLab.Problems.BinPacking.Views 14835-15229 /branches/CloningRefactoring/HeuristicLab.Problems.BinPacking.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.BinPacking.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.BinPacking.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.BinPacking.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.BinPacking.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.BinPacking.Views 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.BinPacking.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.BinPacking.Views 5060 /branches/HLScript/HeuristicLab.Problems.BinPacking.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.BinPacking.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.BinPacking.Views 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.BinPacking.Views 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Problems.BinPacking.Views 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Problems.BinPacking.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.BinPacking.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.BinPacking.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.BinPacking.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.BinPacking.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.BinPacking.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.BinPacking.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.BinPacking.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.BinPacking.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.BinPacking.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.BinPacking.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.BinPacking.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.BinPacking.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.BinPacking.Views 9168-9215 /branches/VNS/HeuristicLab.Problems.BinPacking.Views 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Problems.BinPacking.Views 12948-12950 /branches/histogram/HeuristicLab.Problems.BinPacking.Views 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Problems.BinPacking.Views 14232-14825 /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.Problems.BinPacking.Views 14175
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml
r14162 r15278 33 33 > 34 34 <Grid> 35 <Viewport3D Name="viewport3D1" > 36 <Viewport3D.Camera> 37 <PerspectiveCamera x:Name="camMain" Position="0.5 8 8" LookDirection="0 -1 -1"> <!-- camera position for design time--> 38 </PerspectiveCamera> 39 </Viewport3D.Camera> 40 <ModelVisual3D> 41 <ModelVisual3D.Content> 42 <DirectionalLight x:Name="dirLightMain" Direction="0,-1,-1"/> 43 </ModelVisual3D.Content> 44 </ModelVisual3D> 45 <ModelVisual3D> 46 </ModelVisual3D> 47 <ModelVisual3D x:Name="MyModel"> 48 <ModelVisual3D.Content> 49 <Model3DGroup> 50 <GeometryModel3D> 51 <GeometryModel3D.Geometry> 52 <!-- two opaque cubes, one in front one in back--> 53 <MeshGeometry3D x:Name="meshMain" 54 Positions="0 0 -2.5 1 0 -2.5 0 1 -2.5 1 1 -2.5 0 0 -1.5 1 0 -1.5 0 1 -1.5 1 1 -1.5 55 0 0 0 1 0 0 0 1 0 1 1 0 0 0 1 1 0 1 0 1 1 1 1 1" 56 TriangleIndices="10 11 9 10 9 8 15 9 11 15 13 9 14 13 15 14 12 13 14 10 12 10 8 12 10 15 11 10 14 15 0 9 13 8 13 12 57 2 3 1 2 1 0 7 1 3 7 5 1 6 5 7 6 4 5 6 2 4 2 0 4 2 7 3 2 6 7 0 1 5 0 5 4 "> 58 </MeshGeometry3D> 59 </GeometryModel3D.Geometry> 60 <GeometryModel3D.Material> 61 <DiffuseMaterial> 62 <DiffuseMaterial.Brush> 63 <SolidColorBrush Color="LightGreen"/> 64 </DiffuseMaterial.Brush> 65 </DiffuseMaterial> 66 </GeometryModel3D.Material> 67 </GeometryModel3D> 68 <GeometryModel3D> 69 <GeometryModel3D.Geometry> 70 <!-- two transparent cubes, one in front one in back--> 71 <!-- draw transparent cubes from back to front and always draw outer and inner triangles and draw from front to back--> 72 <MeshGeometry3D x:Name="meshInsides" 73 Positions="-1 -1 -1 2 -1 -1 -1 2 -1 2 2 -1 -1 -1 2 2 -1 2 -1 2 2 2 2 2 74 -1 -1 -3 2 -1 -3 -1 2 -3 2 2 -3 -1 -1 -1 2 -1 -1 -1 2 -1 2 2 -1" 75 TriangleIndices="9 11 10 8 9 10 11 9 15 9 13 15 15 13 14 13 12 14 12 10 14 12 8 10 11 15 10 15 14 10 13 9 8 12 13 8 76 1 3 2 0 1 2 3 1 7 1 5 7 7 5 6 5 4 6 4 2 6 4 0 2 3 7 2 7 6 2 5 1 0 4 5 0 77 "> 78 </MeshGeometry3D> 79 </GeometryModel3D.Geometry> 80 <GeometryModel3D.Material> 81 <MaterialGroup> 82 <DiffuseMaterial> 83 <DiffuseMaterial.Brush> 84 <SolidColorBrush Opacity="0.1" Color="DarkGray"/> 85 </DiffuseMaterial.Brush> 86 </DiffuseMaterial> 87 </MaterialGroup> 88 </GeometryModel3D.Material> 89 </GeometryModel3D> 90 <GeometryModel3D> 91 <GeometryModel3D.Geometry> 92 <!-- two transparent cubes, one in front one in back--> 93 <!-- draw transparent cubes from back to front and always draw outer and inner triangles and draw from front to back--> 94 <MeshGeometry3D x:Name="meshTransparent" 95 Positions="-1 -1 -1 2 -1 -1 -1 2 -1 2 2 -1 -1 -1 2 2 -1 2 -1 2 2 2 2 2 96 -1 -1 -3 2 -1 -3 -1 2 -3 2 2 -3 -1 -1 -1 2 -1 -1 -1 2 -1 2 2 -1" 97 TriangleIndices="2 3 1 2 1 0 7 1 3 7 5 1 6 5 7 6 4 5 6 2 4 2 0 4 2 7 3 2 6 7 0 1 5 0 5 4 98 10 11 9 10 9 8 15 9 11 15 13 9 14 13 15 14 12 13 14 10 12 10 8 12 10 15 11 10 14 15 0 9 13 8 13 12 99 "> 100 </MeshGeometry3D> 101 </GeometryModel3D.Geometry> 102 <GeometryModel3D.Material> 103 <MaterialGroup> 104 <DiffuseMaterial> 105 <DiffuseMaterial.Brush> 106 <SolidColorBrush Opacity="0.1" Color="DarkGray"/> 107 </DiffuseMaterial.Brush> 108 </DiffuseMaterial> 109 </MaterialGroup> 110 </GeometryModel3D.Material> 111 </GeometryModel3D> 112 113 </Model3DGroup> 114 </ModelVisual3D.Content> 115 <ModelVisual3D.Transform> 116 <Transform3DGroup> 117 <ScaleTransform3D x:Name="scale" ScaleX="1" ScaleY="1" ScaleZ="1"/> 118 <TranslateTransform3D OffsetX="-0.5" OffsetY="-0.5" OffsetZ="-0.5" /> 119 <RotateTransform3D> 120 <RotateTransform3D.Rotation> 121 <AxisAngleRotation3D x:Name="rotateX" Axis="0 1 0"/> 122 </RotateTransform3D.Rotation> 123 </RotateTransform3D> 124 <RotateTransform3D> 125 <RotateTransform3D.Rotation> 126 <AxisAngleRotation3D x:Name="rotateY" Axis="1 0 0"/> 127 </RotateTransform3D.Rotation> 128 </RotateTransform3D> 129 <TranslateTransform3D OffsetX="0.5" OffsetY="0.5" OffsetZ="0.5" /> 130 <ScaleTransform3D x:Name="scaleZoom" CenterX="0.5" CenterY="0.5" CenterZ="0.5" ScaleX="1" ScaleY="1" ScaleZ="1"/> 131 </Transform3DGroup> 132 </ModelVisual3D.Transform> 133 </ModelVisual3D> 134 </Viewport3D> 35 <Border BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"> 36 <Viewport3D Name="viewport3D1" > 37 <Viewport3D.Camera> 38 <PerspectiveCamera x:Name="camMain" Position="0.5 8 8" LookDirection="0 -1 -1"> <!-- camera position for design time--> 39 </PerspectiveCamera> 40 </Viewport3D.Camera> 41 <ModelVisual3D> 42 <ModelVisual3D.Content> 43 <DirectionalLight x:Name="dirLightMain" Direction="0,-1,-1"/> 44 </ModelVisual3D.Content> 45 </ModelVisual3D> 46 <ModelVisual3D> 47 </ModelVisual3D> 48 <ModelVisual3D x:Name="MyModel"> 49 <ModelVisual3D.Content> 50 <Model3DGroup> 51 </Model3DGroup> 52 </ModelVisual3D.Content> 53 <ModelVisual3D.Transform> 54 <Transform3DGroup> 55 <ScaleTransform3D x:Name="scale" ScaleX="1" ScaleY="1" ScaleZ="1"/> 56 <RotateTransform3D x:Name="rotateX"> 57 <RotateTransform3D.Rotation> 58 <AxisAngleRotation3D Axis="0 1 0"/> 59 </RotateTransform3D.Rotation> 60 </RotateTransform3D> 61 <RotateTransform3D x:Name="rotateY"> 62 <RotateTransform3D.Rotation> 63 <AxisAngleRotation3D Axis="1 0 0"/> 64 </RotateTransform3D.Rotation> 65 </RotateTransform3D> 66 <ScaleTransform3D x:Name="scaleZoom" ScaleX="1" ScaleY="1" ScaleZ="1"/> 67 </Transform3DGroup> 68 </ModelVisual3D.Transform> 69 </ModelVisual3D> 70 </Viewport3D> 71 </Border> 135 72 </Grid> 136 73 </UserControl>
Note: See TracChangeset
for help on using the changeset viewer.