Skip to content

Commit

Permalink
Initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Rina Lin committed Mar 22, 2021
0 parents commit 1fa897d
Show file tree
Hide file tree
Showing 296 changed files with 77,396 additions and 0 deletions.
Binary file added Debug/AntTweakBar.dll
Binary file not shown.
Binary file added Debug/Mathematical Marbling.exe
Binary file not shown.
7 changes: 7 additions & 0 deletions Debug/Mathematical Marbling.exe.metagen
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ImageRuntimeVersion: v4.0.30319
Assembly Mathematical Marbling, Version=0.0.*, Culture=Invariant Language (Invariant Country):
hash=SHA1, flags=PublicKey
Assembly mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:
hash=None, flags=None
Assembly System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:
hash=None, flags=None
Binary file added Debug/Mathematical Marbling.pdb
Binary file not shown.
Binary file added Debug/freeglut.dll
Binary file not shown.
Binary file added Debug/freeglutd.dll
Binary file not shown.
Binary file added Mathematical Marbling.VC.db
Binary file not shown.
28 changes: 28 additions & 0 deletions Mathematical Marbling.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mathematical Marbling", "Mathematical Marbling\Mathematical Marbling.vcxproj", "{8A036090-5153-4A23-A210-D6FE3D848049}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8A036090-5153-4A23-A210-D6FE3D848049}.Debug|x64.ActiveCfg = Debug|x64
{8A036090-5153-4A23-A210-D6FE3D848049}.Debug|x64.Build.0 = Debug|x64
{8A036090-5153-4A23-A210-D6FE3D848049}.Debug|x86.ActiveCfg = Debug|Win32
{8A036090-5153-4A23-A210-D6FE3D848049}.Debug|x86.Build.0 = Debug|Win32
{8A036090-5153-4A23-A210-D6FE3D848049}.Release|x64.ActiveCfg = Release|x64
{8A036090-5153-4A23-A210-D6FE3D848049}.Release|x64.Build.0 = Release|x64
{8A036090-5153-4A23-A210-D6FE3D848049}.Release|x86.ActiveCfg = Release|Win32
{8A036090-5153-4A23-A210-D6FE3D848049}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
99 changes: 99 additions & 0 deletions Mathematical Marbling/BasicShape.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
#pragma once
#include <iostream>
#include <math.h>
#include "glm\glm.hpp"

using namespace std;

class BasicShape {
private:
string _name;
float _radius;
glm::vec2 _center;
int _layerID;
glm::vec3 _layerColor;

public:
BasicShape() {}
void set(string name, float rad, glm::vec2 center, int layID, glm::vec3 color) {
_name = name;
_radius = rad;
_center = center;
_layerID = layID;
_layerColor = color;
}

void setRadius(float r) {
_radius = r;
}

void setCenter(const float *c) {
_center[0] = c[0];
_center[1] = c[1];
//_center[2] = c[2];
}

void setCenterX(const float c) {
_center[0] = c;
}

void setCenterY(const float c) {
_center[1] = c;
}

/*void setCenterZ(const float c) {
_center[2] = c;
}*/

void setColor(const float *col) {
_layerColor = glm::vec3(col[0], col[1], col[2]);
}

void setColorR(const float c) {
_layerColor[0] = c;
}

void setColorG(const float c) {
_layerColor[1] = c;
}

void setColorB(const float c) {
_layerColor[2] = c;
}

string getName() {
return _name;
}

float getRadius() {
return _radius;
}

glm::vec2 getCenter() {
return _center;
}

float getCenterX() {
return _center[0];
}

float getCenterY() {
return _center[1];
}

float getCenterZ() {
return _center[2];
}

int getLayID() {
return _layerID;
}

glm::vec3 getColor(){
return _layerColor;
}

float getColorR() {return _layerColor[0];}
float getColorG() {return _layerColor[1];}
float getColorB() {return _layerColor[2];}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.24215.1

; Generated by VC++ for Common Language Runtime
.file "C:\Users\CGAL\AppData\Local\Temp\.NETFramework,Version=v4.5.2.AssemblyAttributes.cpp"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.5.2:PlatformToolSet=v140:EnableManagedIncrementalBuild=true:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
Debug|Win32|F:\Courses\Multimedia Signal Processing\Final Project\Mathematical Marbling\|
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
13 changes: 13 additions & 0 deletions Mathematical Marbling/Debug/Mathematical Marbling.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
 main.cpp
f:\courses\multimedia signal processing\final project\mathematical marbling\mathematical marbling\modifier.h(62): warning C4305: '=': truncation from 'double' to 'float'
f:\courses\multimedia signal processing\final project\mathematical marbling\mathematical marbling\modifier.h(63): warning C4305: '=': truncation from 'double' to 'float'
f:\courses\multimedia signal processing\final project\mathematical marbling\mathematical marbling\modifier.h(64): warning C4305: '=': truncation from 'double' to 'float'
main.cpp(71): warning C4018: '<': signed/unsigned mismatch
main.cpp(79): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
main.cpp(85): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
main.cpp(108): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
main.cpp(302): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
main.obj : /DEBUG:FASTLINK is not supported when managed code is present; restarting link with /DEBUG:FULL
main.obj : warning LNK4248: unresolved typeref token (01000018) for 'CTwBar'; image may not run
Mathematical Marbling.vcxproj -> F:\Courses\Multimedia Signal Processing\Final Project\Mathematical Marbling\Debug\Mathematical Marbling.exe
Mathematical Marbling.vcxproj -> F:\Courses\Multimedia Signal Processing\Final Project\Mathematical Marbling\Debug\Mathematical Marbling.pdb (Partial PDB)
Binary file not shown.
Binary file added Mathematical Marbling/Debug/main.obj
Binary file not shown.
Binary file added Mathematical Marbling/Debug/vc140.pdb
Binary file not shown.
141 changes: 141 additions & 0 deletions Mathematical Marbling/Mathematical Marbling.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8A036090-5153-4A23-A210-D6FE3D848049}</ProjectGuid>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>MathematicalMarbling</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>..\include;..\include\AntTweakBar;..\include\OpenGL;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>..\lib;..\lib\AntTweakBar;..\lib\OpenGL;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>..\include;..\include\AntTweakBar;..\include\OpenGL;$(IncludePath)</IncludePath>
<LibraryPath>..\lib;..\lib\AntTweakBar;..\lib\OpenGL;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;..\include\AntTweakBar;..\include\OpenGL;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies />
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies />
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;..\include\AntTweakBar;..\include\OpenGL;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies />
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies />
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="BasicShape.h" />
<ClInclude Include="modifier.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
30 changes: 30 additions & 0 deletions Mathematical Marbling/Mathematical Marbling.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BasicShape.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="modifier.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions Mathematical Marbling/Mathematical Marbling.vcxproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.24215.1

; Generated by VC++ for Common Language Runtime
.file "C:\Users\Windows 10\AppData\Local\Temp\.NETFramework,Version=v4.5.2.AssemblyAttributes.cpp"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.5.2:PlatformToolSet=v140:EnableManagedIncrementalBuild=true:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
Release|Win32|E:\Multimedia Information System\Final Project\MIS final project\Mathematical Marbling\|
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
11 changes: 11 additions & 0 deletions Mathematical Marbling/Release/Mathematical Marbling.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
 main.cpp
e:\multimedia information system\final project\mis final project\mathematical marbling\mathematical marbling\modifier.h(62): warning C4305: '=': truncation from 'double' to 'float'
e:\multimedia information system\final project\mis final project\mathematical marbling\mathematical marbling\modifier.h(64): warning C4305: '=': truncation from 'double' to 'float'
main.cpp(71): warning C4018: '<': signed/unsigned mismatch
main.cpp(79): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
main.cpp(85): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
main.cpp(108): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
main.cpp(302): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
main.obj : warning LNK4248: unresolved typeref token (01000018) for 'CTwBar'; image may not run
Mathematical Marbling.vcxproj -> E:\Multimedia Information System\Final Project\MIS final project\Mathematical Marbling\Release\Mathematical Marbling.exe
Mathematical Marbling.vcxproj -> E:\Multimedia Information System\Final Project\MIS final project\Mathematical Marbling\Release\Mathematical Marbling.pdb (Full PDB)
Binary file not shown.
Binary file added Mathematical Marbling/Release/main.obj
Binary file not shown.
Binary file added Mathematical Marbling/Release/vc140.pdb
Binary file not shown.
Loading

0 comments on commit 1fa897d

Please sign in to comment.