From 371f0b761701a43bb276bf84f2e07feb243ab664 Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Thu, 23 Oct 2014 06:56:23 +0200 Subject: [PATCH 1/7] Format code a little bit. --- .../SharpGL.SceneGraph/Primitives/Teapot.cs | 19 +++++++++---------- .../ObjectLoadingSample/MainWindow.xaml.cs | 3 ++- .../ObjectLoadingSample/SceneDenormaliser.cs | 2 ++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/source/SharpGL/Core/SharpGL.SceneGraph/Primitives/Teapot.cs b/source/SharpGL/Core/SharpGL.SceneGraph/Primitives/Teapot.cs index b96ef485..7fc22395 100644 --- a/source/SharpGL/Core/SharpGL.SceneGraph/Primitives/Teapot.cs +++ b/source/SharpGL/Core/SharpGL.SceneGraph/Primitives/Teapot.cs @@ -246,15 +246,14 @@ public Material Material /// Extensions for Array type. /// public static class ArrayExtensions -{ - /// - /// Flattens the specified array. - /// - /// The array type. - /// The array. - /// The flattened array. - public static T[] Flatten(this T[,,] array) - where T : struct + { + /// + /// Flattens the specified array. + /// + /// The array type. + /// The array. + /// The flattened array. + public static T[] Flatten(this T[,,] array) where T : struct { int size = Marshal.SizeOf(array[0, 0, 0]); int totalSize = Buffer.ByteLength(array); @@ -262,5 +261,5 @@ public static T[] Flatten(this T[,,] array) Buffer.BlockCopy(array, 0, result, 0, totalSize); return result; } -} + } } \ No newline at end of file diff --git a/source/SharpGL/Samples/WPF/ObjectLoadingSample/MainWindow.xaml.cs b/source/SharpGL/Samples/WPF/ObjectLoadingSample/MainWindow.xaml.cs index a93d3b62..2411d4bc 100644 --- a/source/SharpGL/Samples/WPF/ObjectLoadingSample/MainWindow.xaml.cs +++ b/source/SharpGL/Samples/WPF/ObjectLoadingSample/MainWindow.xaml.cs @@ -85,7 +85,8 @@ private void fileOpenItem_Click(object sender, RoutedEventArgs e) // Create a file open dialog. var fileOpenDialog = new OpenFileDialog(); fileOpenDialog.Filter = "Wavefront Files (*.obj)|*.obj|All Files (*.*)|*.*"; - if(fileOpenDialog.ShowDialog(this) == true) + + if (fileOpenDialog.ShowDialog(this) == true) { // Get the path. var filePath = fileOpenDialog.FileName; diff --git a/source/SharpGL/Samples/WPF/ObjectLoadingSample/SceneDenormaliser.cs b/source/SharpGL/Samples/WPF/ObjectLoadingSample/SceneDenormaliser.cs index 32aedac7..e51e432b 100644 --- a/source/SharpGL/Samples/WPF/ObjectLoadingSample/SceneDenormaliser.cs +++ b/source/SharpGL/Samples/WPF/ObjectLoadingSample/SceneDenormaliser.cs @@ -49,6 +49,7 @@ public static List Denormalize(FileFormatWavefront.Model.Scene scene) var ts = indices.Any(ind => ind.uv.HasValue == false) ? null : indices.Select(ind => uvs[ind.uv.Value]).Select(v => new vec2(v.u, v.v)).ToArray(); + meshes.Add(new Mesh { vertices = vs, @@ -57,6 +58,7 @@ public static List Denormalize(FileFormatWavefront.Model.Scene scene) material = facesWithSameIndexCount.First().Material, indicesPerFace = currentIndexCount }); + facesWithSameIndexCount = new List(); facesWithSameIndexCount.Add(face); currentIndexCount = face.Indices.Count; From 2867e2389e69bb9fc1654a97026885301b203321 Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Fri, 2 Jan 2015 18:20:45 +0100 Subject: [PATCH 2/7] Add suggestion in TODO. --- source/SharpGL/Core/SharpGL/OpenGL.cs | 34 ++++++++++++++------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/source/SharpGL/Core/SharpGL/OpenGL.cs b/source/SharpGL/Core/SharpGL/OpenGL.cs index b161274b..086b7e67 100644 --- a/source/SharpGL/Core/SharpGL/OpenGL.cs +++ b/source/SharpGL/Core/SharpGL/OpenGL.cs @@ -6714,22 +6714,24 @@ public virtual bool Create(OpenGLVersion openGLVersion, RenderContextType render if(width == 0 || height == 0 || bitDepth == 0) return false; - // Create an instance of the render context provider. - switch(renderContextType) - { - case RenderContextType.DIBSection: - renderContextProvider = new DIBSectionRenderContextProvider(); - break; - case RenderContextType.NativeWindow: - renderContextProvider = new NativeWindowRenderContextProvider(); - break; - case RenderContextType.HiddenWindow: - renderContextProvider = new HiddenWindowRenderContextProvider(); - break; - case RenderContextType.FBO: - renderContextProvider = new FBORenderContextProvider(); - break; - } + // TODO: [RS] I suggest to replace the switch-case statement with a RenderContextProviderFactory. + + // Create an instance of the render context provider. + switch (renderContextType) + { + case RenderContextType.DIBSection: + renderContextProvider = new DIBSectionRenderContextProvider(); + break; + case RenderContextType.NativeWindow: + renderContextProvider = new NativeWindowRenderContextProvider(); + break; + case RenderContextType.HiddenWindow: + renderContextProvider = new HiddenWindowRenderContextProvider(); + break; + case RenderContextType.FBO: + renderContextProvider = new FBORenderContextProvider(); + break; + } // Create the render context. renderContextProvider.Create(openGLVersion, this, width, height, bitDepth, parameter); From bee9c5688add5a2ca1640b1ef75b88330304a65d Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Mon, 5 Jan 2015 00:24:54 +0100 Subject: [PATCH 3/7] Add toon shader to SimpleShaderSample. --- .../WPF/SimpleShaderSample/MainWindow.xaml.cs | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs b/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs index d0bdac02..c2092990 100644 --- a/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs +++ b/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs @@ -45,7 +45,7 @@ private void OpenGLControl_OpenGLDraw(object sender, OpenGLEventArgs args) Teapot tp = new Teapot(); tp.Draw(gl, 14, 1, OpenGL.GL_FILL); - rotation += 3.0f; + rotation += 1.0f; program.Pop(gl, null); } @@ -58,7 +58,7 @@ private void OpenGLControl_OpenGLInitialized(object sender, OpenGLEventArgs args gl.Enable(OpenGL.GL_DEPTH_TEST); float[] global_ambient = new float[] { 0.5f, 0.5f, 0.5f, 1.0f }; - float[] light0pos = new float[] { 0.0f, 5.0f, 10.0f, 1.0f }; + float[] light0pos = new float[] { 0.5f, 0.75f, 0.75f, 1.0f }; float[] light0ambient = new float[] { 0.2f, 0.2f, 0.2f, 1.0f }; float[] light0diffuse = new float[] { 0.3f, 0.3f, 0.3f, 1.0f }; float[] light0specular = new float[] { 0.8f, 0.8f, 0.8f, 1.0f }; @@ -80,19 +80,39 @@ private void OpenGLControl_OpenGLInitialized(object sender, OpenGLEventArgs args VertexShader vertexShader = new VertexShader(); vertexShader.CreateInContext(gl); vertexShader.SetSource( + "varying vec3 normal;" + Environment.NewLine + + "void main()" + Environment.NewLine + "{" + Environment.NewLine + - "gl_Position = ftransform();" + Environment.NewLine + - "}" + Environment.NewLine); + "normal = gl_NormalMatrix * gl_Normal;" + Environment.NewLine + + "gl_Position = ftransform();" + Environment.NewLine + + "}" + Environment.NewLine + ); // Create a fragment shader. FragmentShader fragmentShader = new FragmentShader(); fragmentShader.CreateInContext(gl); fragmentShader.SetSource( + "varying vec3 normal;" + Environment.NewLine + + "void main()" + Environment.NewLine + "{" + Environment.NewLine + - "gl_FragColor = vec4(0.4,0.4,0.8,1.0);" + Environment.NewLine + - "}" + Environment.NewLine); + "float intensity;" + Environment.NewLine + + "vec4 color;" + Environment.NewLine + + "vec3 n = normalize(normal);" + Environment.NewLine + + "intensity = dot(vec3(gl_LightSource[0].position), n);" + Environment.NewLine + + + "if (intensity > 0.95)" + Environment.NewLine + + "color = vec4(0.5, 0.5, 1.0, 1.0);" + Environment.NewLine + + "else if (intensity > 0.5)" + Environment.NewLine + + "color = vec4(0.3, 0.3, 0.6, 1.0);" + Environment.NewLine + + "else if (intensity > 0.25)" + Environment.NewLine + + "color = vec4(0.2, 0.2, 0.4, 1.0);" + Environment.NewLine + + "else" + Environment.NewLine + + "color = vec4(0.1, 0.1, 0.2, 1.0);" + Environment.NewLine + + "gl_FragColor = color;" + Environment.NewLine + + "}" + Environment.NewLine + ); // Compile them both. vertexShader.Compile(); From 77e6c0d3ceea8fd8a8c9054f5a94204eb9dc119a Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Mon, 5 Jan 2015 00:27:07 +0100 Subject: [PATCH 4/7] Revert rotation speed. --- .../SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs b/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs index c2092990..2d26e14b 100644 --- a/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs +++ b/source/SharpGL/Samples/WPF/SimpleShaderSample/MainWindow.xaml.cs @@ -45,7 +45,7 @@ private void OpenGLControl_OpenGLDraw(object sender, OpenGLEventArgs args) Teapot tp = new Teapot(); tp.Draw(gl, 14, 1, OpenGL.GL_FILL); - rotation += 1.0f; + rotation += 3.0f; program.Pop(gl, null); } From e851a542eb1bc7d6a6300d3f7f8c81091be7637d Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Mon, 5 Jan 2015 00:31:04 +0100 Subject: [PATCH 5/7] Add some more complex SceneGraph model to sample. --- .../WinForms/SceneSample/FormSceneSample.cs | 108 +++++++++++++++--- source/SharpGL/SharpGL.sln | 18 ++- 2 files changed, 109 insertions(+), 17 deletions(-) diff --git a/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs b/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs index e92b1358..20a2b261 100644 --- a/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs +++ b/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs @@ -15,6 +15,8 @@ using SharpGL.SceneGraph.Lighting; using SharpGL.SceneGraph.Effects; using SharpGL.SceneGraph.Primitives; +using SharpGL.SceneGraph.Transformations; +using SharpGL.SceneGraph.Quadrics; namespace SceneSample { @@ -31,31 +33,107 @@ public FormSceneSample() sceneControl1.MouseMove += new MouseEventHandler(FormSceneSample_MouseMove); sceneControl1.MouseUp += new MouseEventHandler(sceneControl1_MouseUp); - // Add some design-time primitives. - sceneControl1.Scene.SceneContainer.AddChild(new - SharpGL.SceneGraph.Primitives.Grid()); - sceneControl1.Scene.SceneContainer.AddChild(new - SharpGL.SceneGraph.Primitives.Axies()); + // Add some design-time primitives. + sceneControl1.Scene.SceneContainer.AddChild(new Grid()); + sceneControl1.Scene.SceneContainer.AddChild(new Axies()); - // Create a light. + // Create a light. Light light = new Light() { On = true, - Position = new Vertex(3, 10, 3), + Position = new Vertex(-3, 10, 3), GLCode = OpenGL.GL_LIGHT0 }; - // Add the light. + // Add the light. sceneControl1.Scene.SceneContainer.AddChild(light); - // Create a sphere. - Cube cube = new Cube(); - cube.AddEffect(arcBallEffect); - - // Add it. - sceneControl1.Scene.SceneContainer.AddChild(cube); + // Create the torso. + Cube torso = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateZ = 4.0f, + ScaleX = 1.0f, ScaleY = 1.25f, ScaleZ = 1.25f + }, + Name = "Torso" + }; + + torso.AddEffect(arcBallEffect); + + // Create the head. + Cube head = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateZ = 1.5f, + ScaleX = 0.4f, ScaleY = 0.4f, ScaleZ = 0.4f + }, + Name = "Left Arm" + }; + + // Create the arms. + Cube rightArm = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateY = -1.3f, TranslateZ = -0.5f, + ScaleX = 0.2f, ScaleY = 0.2f + }, + Name = "Right Arm" + }; + + Cube leftArm = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateX = -1.0f, TranslateY = 1.3f, TranslateZ = -0.1f, + RotateY = 45.0f, + ScaleX = 0.2f, ScaleY = 0.2f + }, + Name = "Left Leg" + }; + + // Create the legs. + Cube rightLeg = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateY = -0.7f, TranslateZ = -1.3f, + ScaleX = 0.2f, ScaleY = 0.2f, ScaleZ = 2f + }, + Name = "Right Leg" + }; + + Cube leftLeg = new Cube() + { + Transformation = new LinearTransformation() + { + TranslateY = 0.7f, TranslateZ = -1.3f, + ScaleX = 0.2f, ScaleY = 0.2f, ScaleZ = 2f + }, + Name = "Left Leg" + }; - // Add the root element to the tree. + //Sphere head = new Sphere() + //{ + // Transformation = new LinearTransformation() + // { + // TranslateZ = 0.5f + // }, + // Name = "Head" + //}; + + torso.AddChild(head); + torso.AddChild(rightArm); + torso.AddChild(leftArm); + torso.AddChild(rightLeg); + torso.AddChild(leftLeg); + + // Add torso to scene. + sceneControl1.Scene.SceneContainer.AddChild(torso); + + // Add the root element to the scene tree view control. AddElementToTree(sceneControl1.Scene.SceneContainer, treeView1.Nodes); } diff --git a/source/SharpGL/SharpGL.sln b/source/SharpGL/SharpGL.sln index 3240ade3..959100be 100644 --- a/source/SharpGL/SharpGL.sln +++ b/source/SharpGL/SharpGL.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.22310.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{EC6B45C3-BF0D-41E0-B3FE-D73A8265F1D3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpGL", "Core\SharpGL\SharpGL.csproj", "{5EF45533-E2C7-46F2-B4A3-B8F36CD406E0}" @@ -18,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{D2E990 SharedAssemblyInfo.cs = SharedAssemblyInfo.cs EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleShaderSample", "Samples\WPF\SimpleShaderSample\SimpleShaderSample.csproj", "{6DB0A8E3-0385-4B1A-BF61-44F8275909A2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +92,16 @@ Global {47BCAA39-EDAD-4404-B6BD-4742B0ABB523}.Release|Mixed Platforms.Build.0 = Release|Any CPU {47BCAA39-EDAD-4404-B6BD-4742B0ABB523}.Release|x86.ActiveCfg = Release|Any CPU {47BCAA39-EDAD-4404-B6BD-4742B0ABB523}.Release|x86.Build.0 = Release|Any CPU + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Debug|x86.ActiveCfg = Debug|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Debug|x86.Build.0 = Debug|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|Any CPU.ActiveCfg = Release|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|Mixed Platforms.Build.0 = Release|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|x86.ActiveCfg = Release|x86 + {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 28620c71b91e8eaaec9858632cdf0317830bca00 Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Mon, 5 Jan 2015 01:45:55 +0100 Subject: [PATCH 6/7] Add sample project to solution. --- source/SharpGL/SharpGL.sln | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/source/SharpGL/SharpGL.sln b/source/SharpGL/SharpGL.sln index 959100be..6ead4646 100644 --- a/source/SharpGL/SharpGL.sln +++ b/source/SharpGL/SharpGL.sln @@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{D2E990 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleShaderSample", "Samples\WPF\SimpleShaderSample\SimpleShaderSample.csproj", "{6DB0A8E3-0385-4B1A-BF61-44F8275909A2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SceneSample", "Samples\WinForms\SceneSample\SceneSample.csproj", "{5DDE8F09-0202-41F1-BE23-E4843CA38A07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -102,6 +104,18 @@ Global {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|Mixed Platforms.Build.0 = Release|x86 {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|x86.ActiveCfg = Release|x86 {6DB0A8E3-0385-4B1A-BF61-44F8275909A2}.Release|x86.Build.0 = Release|x86 + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|x86.ActiveCfg = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Debug|x86.Build.0 = Debug|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|Any CPU.Build.0 = Release|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|x86.ActiveCfg = Release|Any CPU + {5DDE8F09-0202-41F1-BE23-E4843CA38A07}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 92db00e27b824da48ca6121ee26294bf8056497e Mon Sep 17 00:00:00 2001 From: Robin Sedlaczek Date: Tue, 20 Jan 2015 19:48:34 +0100 Subject: [PATCH 7/7] Some code formattings. --- source/SharpGL/Core/SharpGL/OpenGLExtensions.cs | 1 + source/SharpGL/Core/SharpGL/SharpGL.csproj | 3 ++- .../SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs | 4 +++- source/SharpGL/SharpGL.sln | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/SharpGL/Core/SharpGL/OpenGLExtensions.cs b/source/SharpGL/Core/SharpGL/OpenGLExtensions.cs index 5ddeafd0..306eea32 100644 --- a/source/SharpGL/Core/SharpGL/OpenGLExtensions.cs +++ b/source/SharpGL/Core/SharpGL/OpenGLExtensions.cs @@ -8,6 +8,7 @@ namespace SharpGL { public partial class OpenGL { + /// /// Determines whether a named extension function is supported. /// diff --git a/source/SharpGL/Core/SharpGL/SharpGL.csproj b/source/SharpGL/Core/SharpGL/SharpGL.csproj index 02576d84..183942d2 100644 --- a/source/SharpGL/Core/SharpGL/SharpGL.csproj +++ b/source/SharpGL/Core/SharpGL/SharpGL.csproj @@ -63,8 +63,8 @@ - + @@ -88,6 +88,7 @@ + diff --git a/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs b/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs index 20a2b261..d914c6ed 100644 --- a/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs +++ b/source/SharpGL/Samples/WinForms/SceneSample/FormSceneSample.cs @@ -67,7 +67,9 @@ public FormSceneSample() Transformation = new LinearTransformation() { TranslateZ = 1.5f, - ScaleX = 0.4f, ScaleY = 0.4f, ScaleZ = 0.4f + ScaleX = 0.4f, + ScaleY = 0.4f, + ScaleZ = 0.4f }, Name = "Left Arm" }; diff --git a/source/SharpGL/SharpGL.sln b/source/SharpGL/SharpGL.sln index 6ead4646..3bcbc42d 100644 --- a/source/SharpGL/SharpGL.sln +++ b/source/SharpGL/SharpGL.sln @@ -128,4 +128,7 @@ Global {47BCAA39-EDAD-4404-B6BD-4742B0ABB523} = {EC6B45C3-BF0D-41E0-B3FE-D73A8265F1D3} {D2E99047-F511-4CE1-B07F-41412E9FF7B4} = {EC6B45C3-BF0D-41E0-B3FE-D73A8265F1D3} EndGlobalSection + GlobalSection(NDepend) = preSolution + Project = ".\SharpGL1.ndproj" + EndGlobalSection EndGlobal