Skip to content

Commit

Permalink
Updated models and materials.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkkellogg
mkkellogg committed Jul 29, 2015
1 parent 024302b commit a71ebae
Show file tree
Hide file tree
Showing 21 changed files with 1,419 additions and 41 deletions.
2 changes: 2 additions & 0 deletions Unity/Assembly-CSharp-vs.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@
<Compile Include="Assets\CSG-BSP\Scripts\CSG\Vector4D.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\CSG\Vertex.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\CSGUtil.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Extensions.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Structure\FastLinkedList.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\BaseTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\SliceTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\SubtractionTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\TestManager.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\UnshareNormals.cs" />
<Reference Include="UnityEngine.UI">
<HintPath>D:/Programs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
Expand Down
2 changes: 2 additions & 0 deletions Unity/Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@
<Compile Include="Assets\CSG-BSP\Scripts\CSG\Vector4D.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\CSG\Vertex.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\CSGUtil.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Extensions.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Structure\FastLinkedList.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\BaseTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\SliceTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\SubtractionTest.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\Tests\TestManager.cs" />
<Compile Include="Assets\CSG-BSP\Scripts\UnshareNormals.cs" />
<Reference Include="UnityEngine.UI">
<HintPath>D:/Programs/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
Expand Down
Binary file modified Unity/Assets/CSG-BSP/Materials/Orange.mat
View file
Binary file not shown.
332 changes: 332 additions & 0 deletions Unity/Assets/CSG-BSP/Models/cylinder.fbx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,332 @@
; FBX 6.1.0 project file
; Created by Blender FBX Exporter
; for support mail: ideasman42@gmail.com
; ----------------------------------------------------

FBXHeaderExtension: {
FBXHeaderVersion: 1003
FBXVersion: 6100
CreationTimeStamp: {
Version: 1000
Year: 2015
Month: 07
Day: 28
Hour: 17
Minute: 36
Second: 44
Millisecond: 0
}
Creator: "FBX SDK/FBX Plugins build 20070228"
OtherFlags: {
FlagPLE: 0
}
}
CreationTime: "2015-07-28 17:36:44:000"
Creator: "Blender version 2.65 (sub 0)"

; Object definitions
;------------------------------------------------------------------

Definitions: {
Version: 100
Count: 3
ObjectType: "Model" {
Count: 1
}
ObjectType: "Geometry" {
Count: 1
}
ObjectType: "Material" {
Count: 1
}
ObjectType: "Pose" {
Count: 1
}
ObjectType: "GlobalSettings" {
Count: 1
}
}

; Object properties
;------------------------------------------------------------------

Objects: {
Model: "Model::Cylinder", "Mesh" {
Version: 232
Properties60: {
Property: "QuaternionInterpolate", "bool", "",0
Property: "Visibility", "Visibility", "A+",1
Property: "Lcl Translation", "Lcl Translation", "A+",0.040010191500187,-0.016024887561798,-0.027147032320499
Property: "Lcl Rotation", "Lcl Rotation", "A+",-90.000009334538021,0.000000000000000,0.000000000000000
Property: "Lcl Scaling", "Lcl Scaling", "A+",1.000000000000000,1.000000000000000,1.572132587432861
Property: "RotationOffset", "Vector3D", "",0,0,0
Property: "RotationPivot", "Vector3D", "",0,0,0
Property: "ScalingOffset", "Vector3D", "",0,0,0
Property: "ScalingPivot", "Vector3D", "",0,0,0
Property: "TranslationActive", "bool", "",0
Property: "TranslationMin", "Vector3D", "",0,0,0
Property: "TranslationMax", "Vector3D", "",0,0,0
Property: "TranslationMinX", "bool", "",0
Property: "TranslationMinY", "bool", "",0
Property: "TranslationMinZ", "bool", "",0
Property: "TranslationMaxX", "bool", "",0
Property: "TranslationMaxY", "bool", "",0
Property: "TranslationMaxZ", "bool", "",0
Property: "RotationOrder", "enum", "",0
Property: "RotationSpaceForLimitOnly", "bool", "",0
Property: "AxisLen", "double", "",10
Property: "PreRotation", "Vector3D", "",0,0,0
Property: "PostRotation", "Vector3D", "",0,0,0
Property: "RotationActive", "bool", "",0
Property: "RotationMin", "Vector3D", "",0,0,0
Property: "RotationMax", "Vector3D", "",0,0,0
Property: "RotationMinX", "bool", "",0
Property: "RotationMinY", "bool", "",0
Property: "RotationMinZ", "bool", "",0
Property: "RotationMaxX", "bool", "",0
Property: "RotationMaxY", "bool", "",0
Property: "RotationMaxZ", "bool", "",0
Property: "RotationStiffnessX", "double", "",0
Property: "RotationStiffnessY", "double", "",0
Property: "RotationStiffnessZ", "double", "",0
Property: "MinDampRangeX", "double", "",0
Property: "MinDampRangeY", "double", "",0
Property: "MinDampRangeZ", "double", "",0
Property: "MaxDampRangeX", "double", "",0
Property: "MaxDampRangeY", "double", "",0
Property: "MaxDampRangeZ", "double", "",0
Property: "MinDampStrengthX", "double", "",0
Property: "MinDampStrengthY", "double", "",0
Property: "MinDampStrengthZ", "double", "",0
Property: "MaxDampStrengthX", "double", "",0
Property: "MaxDampStrengthY", "double", "",0
Property: "MaxDampStrengthZ", "double", "",0
Property: "PreferedAngleX", "double", "",0
Property: "PreferedAngleY", "double", "",0
Property: "PreferedAngleZ", "double", "",0
Property: "InheritType", "enum", "",0
Property: "ScalingActive", "bool", "",0
Property: "ScalingMin", "Vector3D", "",1,1,1
Property: "ScalingMax", "Vector3D", "",1,1,1
Property: "ScalingMinX", "bool", "",0
Property: "ScalingMinY", "bool", "",0
Property: "ScalingMinZ", "bool", "",0
Property: "ScalingMaxX", "bool", "",0
Property: "ScalingMaxY", "bool", "",0
Property: "ScalingMaxZ", "bool", "",0
Property: "GeometricTranslation", "Vector3D", "",0,0,0
Property: "GeometricRotation", "Vector3D", "",0,0,0
Property: "GeometricScaling", "Vector3D", "",1,1,1
Property: "LookAtProperty", "object", ""
Property: "UpVectorProperty", "object", ""
Property: "Show", "bool", "",1
Property: "NegativePercentShapeSupport", "bool", "",1
Property: "DefaultAttributeIndex", "int", "",0
Property: "Color", "Color", "A",0.8,0.8,0.8
Property: "Size", "double", "",100
Property: "Look", "enum", "",1
}
MultiLayer: 0
MultiTake: 1
Shading: Y
Culling: "CullingOff"
Vertices: 0.000000,1.000000,-1.000000,0.000000,1.000000,1.000000,0.195090,0.980785,-1.000000,0.195090,0.980785,1.000000,0.382683,0.923880,-1.000000,0.382683,0.923880,1.000000,0.555570,0.831470,-1.000000
,0.555570,0.831470,1.000000,0.707107,0.707107,-1.000000,0.707107,0.707107,1.000000,0.831470,0.555570,-1.000000,0.831470,0.555570,1.000000,0.923880,0.382683,-1.000000,0.923880,0.382683,1.000000
,0.980785,0.195090,-1.000000,0.980785,0.195090,1.000000,1.000000,0.000000,-1.000000,1.000000,0.000000,1.000000,0.980785,-0.195090,-1.000000,0.980785,-0.195090,1.000000,0.923880,-0.382683,-1.000000
,0.923880,-0.382683,1.000000,0.831470,-0.555570,-1.000000,0.831470,-0.555570,1.000000,0.707107,-0.707107,-1.000000,0.707107,-0.707107,1.000000,0.555570,-0.831470,-1.000000,0.555570,-0.831470,1.000000
,0.382683,-0.923880,-1.000000,0.382683,-0.923880,1.000000,0.195090,-0.980785,-1.000000,0.195090,-0.980785,1.000000,-0.000000,-1.000000,-1.000000,-0.000000,-1.000000,1.000000,-0.195091,-0.980785,-1.000000
,-0.195091,-0.980785,1.000000,-0.382684,-0.923879,-1.000000,-0.382684,-0.923879,1.000000,-0.555571,-0.831469,-1.000000,-0.555571,-0.831469,1.000000,-0.707107,-0.707106,-1.000000,-0.707107,-0.707106,1.000000
,-0.831470,-0.555570,-1.000000,-0.831470,-0.555570,1.000000,-0.923880,-0.382683,-1.000000,-0.923880,-0.382683,1.000000,-0.980785,-0.195089,-1.000000,-0.980785,-0.195089,1.000000,-1.000000,0.000001,-1.000000
,-1.000000,0.000001,1.000000,-0.980785,0.195091,-1.000000,-0.980785,0.195091,1.000000,-0.923879,0.382684,-1.000000,-0.923879,0.382684,1.000000,-0.831469,0.555571,-1.000000,-0.831469,0.555571,1.000000
,-0.707106,0.707108,-1.000000,-0.707106,0.707108,1.000000,-0.555569,0.831470,-1.000000,-0.555569,0.831470,1.000000,-0.382682,0.923880,-1.000000,-0.382682,0.923880,1.000000,-0.195089,0.980786,-1.000000
,-0.195089,0.980786,1.000000
PolygonVertexIndex: 0,1,3,-3,2,3,5,-5,4,5,7,-7,6,7,9,-9,8,9,11,-11,10,11,13,-13,12,13,15,-15,14,15,17,-17,16,17,19,-19,18,19,21,-21,20,21,23,-23,22,23,25,-25,24,25,27,-27
,26,27,29,-29,28,29,31,-31,30,31,33,-33,32,33,35,-35,34,35,37,-37,36,37,39,-39,38,39,41,-41,40,41,43,-43,42,43,45,-45,44,45,47,-47,46,47,49,-49,48,49,51,-51,50,51,53,-53
,52,53,55,-55,54,55,57,-57,56,57,59,-59,58,59,61,-61,3,1,-64,3,63,-62,3,61,-6,61,59,-6,59,7,-6,59,57,-8,57,9,-8,57,55,-10,55,11,-10
,55,53,-12,53,13,-12,53,51,-14,51,15,-14,51,49,-16,49,17,-16,49,47,-18,47,19,-18,47,45,-20,45,21,-20,45,43,-22,43,23,-22,43,41,-24
,41,25,-24,41,39,-26,39,27,-26,39,37,-28,37,29,-28,37,35,-30,35,31,-30,35,33,-32,1,0,62,-64,60,61,63,-63,0,2,-63,2,60,-63,2,4,-61
,4,58,-61,4,6,-59,6,56,-59,6,8,-57,8,54,-57,8,10,-55,10,52,-55,10,12,-53,12,50,-53,12,14,-51,14,48,-51,14,16,-49,16,46,-49
,16,18,-47,18,44,-47,18,20,-45,20,42,-45,20,22,-43,22,40,-43,22,24,-41,24,38,-41,24,26,-39,26,36,-39,26,28,-37,28,34,-37,28,30,-35
,30,32,-35
Edges:
GeometryVersion: 124
LayerElementNormal: 0 {
Version: 101
Name: ""
MappingInformationType: "ByVertice"
ReferenceInformationType: "Direct"
Normals: 0.000000000000000,0.727866470813751,-0.685689866542816,0.000000000000000,0.727866470813751,0.685689866542816
,0.142002627253532,0.713889002799988,-0.685689866542816,0.142002627253532,0.713889002799988,0.685689866542816
,0.278542429208755,0.672475337982178,-0.685689866542816,0.278542429208755,0.672475337982178,0.685689866542816
,0.404370248317719,0.605212569236755,-0.685689866542816,0.404370248317719,0.605212569236755,0.685689866542816
,0.514664173126221,0.514664173126221,-0.685689866542816,0.514664173126221,0.514664173126221,0.685689866542816
,0.605212569236755,0.404370248317719,-0.685689866542816,0.605212569236755,0.404370248317719,0.685689866542816
,0.672475337982178,0.278542429208755,-0.685689866542816,0.672475337982178,0.278542429208755,0.685689866542816
,0.713889002799988,0.142002627253532,-0.685689866542816,0.713889002799988,0.142002627253532,0.685689866542816
,0.727866470813751,0.000000000000000,-0.685689866542816,0.727866470813751,0.000000000000000,0.685689866542816
,0.713889002799988,-0.142002627253532,-0.685689866542816,0.713889002799988,-0.142002627253532,0.685689866542816
,0.672475337982178,-0.278542429208755,-0.685689866542816,0.672475337982178,-0.278542429208755,0.685689866542816
,0.605212569236755,-0.404370248317719,-0.685689866542816,0.605212569236755,-0.404370248317719,0.685689866542816
,0.514664173126221,-0.514664173126221,-0.685689866542816,0.514664173126221,-0.514664173126221,0.685689866542816
,0.404370248317719,-0.605212569236755,-0.685689866542816,0.404370248317719,-0.605212569236755,0.685689866542816
,0.278542429208755,-0.672475337982178,-0.685689866542816,0.278542429208755,-0.672475337982178,0.685689866542816
,0.142002627253532,-0.713889002799988,-0.685689866542816,0.142002627253532,-0.713889002799988,0.685689866542816
,0.000000000000000,-0.727866470813751,-0.685689866542816,0.000000000000000,-0.727866470813751,0.685689866542816
,-0.142002627253532,-0.713889002799988,-0.685689866542816,-0.142002627253532,-0.713889002799988,0.685689866542816
,-0.278542429208755,-0.672475337982178,-0.685689866542816,-0.278542429208755,-0.672475337982178,0.685689866542816
,-0.404370248317719,-0.605212569236755,-0.685689866542816,-0.404370248317719,-0.605212569236755,0.685689866542816
,-0.514664173126221,-0.514664173126221,-0.685689866542816,-0.514664173126221,-0.514664173126221,0.685689866542816
,-0.605212569236755,-0.404370248317719,-0.685689866542816,-0.605212569236755,-0.404370248317719,0.685689866542816
,-0.672475337982178,-0.278542429208755,-0.685689866542816,-0.672475337982178,-0.278542429208755,0.685689866542816
,-0.713889002799988,-0.142002627253532,-0.685689866542816,-0.713889002799988,-0.142002627253532,0.685689866542816
,-0.727866470813751,0.000000000000000,-0.685689866542816,-0.727866470813751,0.000000000000000,0.685689866542816
,-0.713889002799988,0.142002627253532,-0.685689866542816,-0.713889002799988,0.142002627253532,0.685689866542816
,-0.672475337982178,0.278542429208755,-0.685689866542816,-0.672475337982178,0.278542429208755,0.685689866542816
,-0.605212569236755,0.404370248317719,-0.685689866542816,-0.605212569236755,0.404370248317719,0.685689866542816
,-0.514664173126221,0.514694690704346,-0.685689866542816,-0.514664173126221,0.514694690704346,0.685689866542816
,-0.404370248317719,0.605212569236755,-0.685689866542816,-0.404370248317719,0.605212569236755,0.685689866542816
,-0.278542429208755,0.672475337982178,-0.685689866542816,-0.278542429208755,0.672475337982178,0.685689866542816
,-0.142002627253532,0.713889002799988,-0.685689866542816,-0.142002627253532,0.713889002799988,0.685689866542816
}
LayerElementSmoothing: 0 {
Version: 102
Name: ""
MappingInformationType: "ByPolygon"
ReferenceInformationType: "Direct"
Smoothing: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
}
Layer: 0 {
Version: 100
LayerElement: {
Type: "LayerElementNormal"
TypedIndex: 0
}
LayerElement: {
Type: "LayerElementSmoothing"
TypedIndex: 0
}
}
}
Material: "Material::unnamed", "" {
Version: 102
ShadingModel: "phong"
MultiLayer: 0
Properties60: {
Property: "ShadingModel", "KString", "", "Phong"
Property: "MultiLayer", "bool", "",0
Property: "EmissiveColor", "ColorRGB", "",0.8000,0.8000,0.8000
Property: "EmissiveFactor", "double", "",0.0000
Property: "AmbientColor", "ColorRGB", "",0.0000,0.0000,0.0000
Property: "AmbientFactor", "double", "",0.5000
Property: "DiffuseColor", "ColorRGB", "",0.8000,0.8000,0.8000
Property: "DiffuseFactor", "double", "",1.0000
Property: "Bump", "Vector3D", "",0,0,0
Property: "TransparentColor", "ColorRGB", "",1,1,1
Property: "TransparencyFactor", "double", "",0.0000
Property: "SpecularColor", "ColorRGB", "",0.8000,0.8000,0.8000
Property: "SpecularFactor", "double", "",0.2000
Property: "ShininessExponent", "double", "",80.0
Property: "ReflectionColor", "ColorRGB", "",0,0,0
Property: "ReflectionFactor", "double", "",1
Property: "Emissive", "ColorRGB", "",0,0,0
Property: "Ambient", "ColorRGB", "",0.0,0.0,0.0
Property: "Diffuse", "ColorRGB", "",0.8,0.8,0.8
Property: "Specular", "ColorRGB", "",0.8,0.8,0.8
Property: "Shininess", "double", "",20.0
Property: "Opacity", "double", "",1.0
Property: "Reflectivity", "double", "",0
}
}
Pose: "Pose::BIND_POSES", "BindPose" {
Type: "BindPose"
Version: 100
Properties60: {
}
NbPoseNodes: 1
PoseNode: {
Node: "Model::Cylinder"
Matrix: 0.000000075497901,0.000000000000000,-1.000000000000000,0.000000000000000,-1.000000000000000,0.000000000000000,-0.000000075497901,0.000000000000000,0.000000000000000,1.572132587432861,0.000000000000000,0.000000000000000,0.040010191500187,-0.016024887561798,-0.027147032320499,1.000000000000000
}
}
GlobalSettings: {
Version: 1000
Properties60: {
Property: "UpAxis", "int", "",1
Property: "UpAxisSign", "int", "",1
Property: "FrontAxis", "int", "",2
Property: "FrontAxisSign", "int", "",1
Property: "CoordAxis", "int", "",0
Property: "CoordAxisSign", "int", "",1
Property: "UnitScaleFactor", "double", "",1
}
}
}

; Object relations
;------------------------------------------------------------------

Relations: {
Model: "Model::Cylinder", "Mesh" {
}
Model: "Model::Producer Perspective", "Camera" {
}
Model: "Model::Producer Top", "Camera" {
}
Model: "Model::Producer Bottom", "Camera" {
}
Model: "Model::Producer Front", "Camera" {
}
Model: "Model::Producer Back", "Camera" {
}
Model: "Model::Producer Right", "Camera" {
}
Model: "Model::Producer Left", "Camera" {
}
Model: "Model::Camera Switcher", "CameraSwitcher" {
}
Material: "Material::unnamed", "" {
}
}

; Object connections
;------------------------------------------------------------------

Connections: {
Connect: "OO", "Model::Cylinder", "Model::Scene"
}
;Takes and animation section
;----------------------------------------------------

Takes: {
Current: ""
}
;Version 5 settings
;------------------------------------------------------------------

Version5: {
AmbientRenderSettings: {
Version: 101
AmbientLightColor: 0.0,0.0,0.0,0
}
FogOptions: {
FogEnable: 0
FogMode: 0
FogDensity: 0.000
FogStart: 5.000
FogEnd: 25.000
FogColor: 0.1,0.1,0.1,1
}
Settings: {
FrameRate: "24"
TimeFormat: 1
SnapOnFrames: 0
ReferenceTimeIndex: -1
TimeLineStartTime: 0
TimeLineStopTime: 479181389250
}
RendererSetting: {
DefaultCamera: "Producer Perspective"
DefaultViewingMode: 0
}
}
Loading

0 comments on commit a71ebae

Please sign in to comment.