Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
58859f2
New architecture: Move SofaUnityAPI under Runtime/Core/Plugins/
epernod Mar 11, 2026
d83374a
New architecture: Move all scripts under Core into Runtime/Core and a…
epernod Mar 11, 2026
8846b63
New architecture: Move all reources into Runtime/Resources and Core/P…
epernod Mar 11, 2026
4e5a686
Remove dll, should not be in the history
epernod Mar 11, 2026
3f5df9e
New architecture: Move all scenes into Samples
epernod Mar 12, 2026
809278e
Restore Fluoroscopy module in main repository
epernod Mar 12, 2026
b72c433
Restore Ultrasound module in main repository
epernod Mar 12, 2026
d466379
Restore Geomagic module in main repository
epernod Mar 12, 2026
83dc3b4
Restore HapticAvatar module in main repository
epernod Mar 12, 2026
8b92727
Restore HaplyRobotics module in main repository
epernod Mar 12, 2026
914ef58
Remove Modules submodules and add missing meta files
epernod Mar 12, 2026
4bbd224
Add package.json file
epernod Mar 12, 2026
b009b4a
massive reorder again, remove Modules, it will be kept in a seperated…
epernod Mar 12, 2026
a753a96
Update git ignore file to new archi
epernod Mar 12, 2026
81890a5
remove Samples/Modules
epernod Mar 12, 2026
fdaa6ac
Update code to match new archi
epernod Mar 12, 2026
2dff488
Add patch to change saved scene filename to match new architecture at…
epernod Mar 12, 2026
14be547
remove x64 folder. Should not be added
epernod Mar 12, 2026
593099d
add samples as samples
epernod Mar 12, 2026
2c3d6e3
rename Sample as Sample~
epernod Mar 12, 2026
34437a1
add asmdef files?
epernod Mar 12, 2026
cc39fb1
add asmdef files?
epernod Mar 13, 2026
f1c3145
up asmdef files
epernod Mar 13, 2026
b9a5fe0
upupup
epernod Mar 13, 2026
94defc1
upupupup
epernod Mar 13, 2026
74ca659
dispatch asmdef, should not be in the same folder
epernod Mar 13, 2026
6660f90
Fix compilation due to bad namespace mixed
epernod Mar 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Core/Plugins/Native/x64/*.dll
Core/Plugins/Native/x64/*.meta
Core/Plugins/Native/x64/
Runtime/Plugins/Native/x64/*.dll
Runtime/Plugins/Native/x64/*.meta
Runtime/Plugins/Native/x64/
License/*
*.pyc
*.pyc.*
Core/Scripts/Editor/Tests/logs/
Runtime/Scripts/Editor/Tests/logs/
Tests/logs/
Core/Scripts/UI/DataManager/DynamicDataSaves/*.JSON
Core/Scripts/UI/DataManager/DynamicDataSaves/*.meta
Runtime/Scripts/UI/DataManager/DynamicDataSaves/*.JSON
Runtime/Scripts/UI/DataManager/DynamicDataSaves/*.meta
18 changes: 0 additions & 18 deletions .gitmodules

This file was deleted.

12 changes: 0 additions & 12 deletions Core.meta

This file was deleted.

2 changes: 1 addition & 1 deletion Modules.meta → DevProject.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Doc/Third-Party Notices.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
All files under SofaUnity/Core/Plugins/Native/x64/
All files under SofaUnity/Runtime/Plugins/Native/x64/
are Dynamic Link Library to use the SOFA framework and need to be downloaded from the Github release page of the project:
https://github.com/InfinyTech3D/SofaUnity/releases/tag/SofaUnity_v23.12

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ public class CopyConfigPostProcessor
/// </summary>
static CopyConfigPostProcessor()
{
string sofaIniFile = Application.dataPath + "/SofaUnity/Core/Plugins/Native/x64/sofa.ini";
string sofaIniFile = Application.dataPath + "/SofaUnity/Runtime/Plugins/Native/x64/sofa.ini";
using (StreamWriter outputIniFile = new StreamWriter(sofaIniFile))
{
string SofaUnityDir = Application.dataPath + "/SofaUnity/scenes/SofaScenes";
string SofaUnityDir = Application.dataPath + "/SofaUnity/Samples/SofaScenes";
outputIniFile.WriteLine("SHARE_DIR=" + SofaUnityDir);
outputIniFile.WriteLine("SHARE_DIR=C:/projects/sofa-src/share/");
outputIniFile.WriteLine("EXAMPLES_DIR=" + SofaUnityDir);
outputIniFile.WriteLine("LICENSE_DIR=" + Application.dataPath + "/SofaUnity/License/");
outputIniFile.WriteLine("BUILD_DIR=" + Application.dataPath + "/SofaUnity/Core/Plugins/Native/x64/");
outputIniFile.WriteLine("BUILD_DIR=" + Application.dataPath + "/SofaUnity/Runtime/Plugins/Native/x64/");
}
}

Expand Down Expand Up @@ -139,15 +139,15 @@ public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProj
}
}

// Specific method to build SofaUnity folders on windows build. Will create SofaUnity/Core with plugin and sofa.ini file as well as SofaUnity/Scenes/SofaScenes folder
// Specific method to build SofaUnity folders on windows build. Will create SofaUnity/Runtime with plugin and sofa.ini file as well as SofaUnity/Samples/SofaScenes folder
static void BuildForWindows(string pathToBuiltProject)
{
// Get build root Path
string rootBuildPath = pathToBuiltProject.Replace(".exe", "") + "_Data";

// Create bin build path
string binBuildPath = rootBuildPath + "/SofaUnity/Core/Plugins/Native/x64/";
string dataBuildPath = rootBuildPath + "/SofaUnity/scenes/SofaScenes";
string binBuildPath = rootBuildPath + "/SofaUnity/Runtime/Plugins/Native/x64/";
string dataBuildPath = rootBuildPath + "/SofaUnity/Samples/SofaScenes";

Directory.CreateDirectory(binBuildPath);
Debug.Log("[SofaUnity - BuildForWindows] Create directory: " + binBuildPath);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions Editor/SofaUnity.Editor.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "SofaUnity.Editor",
"rootNamespace": "SofaUnity",
"references": [
"SofaUnity.API",
"SofaUnity"
],
"includePlatforms": [
"Editor"
]
}
7 changes: 7 additions & 0 deletions Editor/SofaUnity.Editor.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion Modules
Submodule Modules deleted from a15040
5 changes: 2 additions & 3 deletions Scenes.meta → Runtime.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions Runtime/Plugins/SofaUnity.API.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "SofaUnity.API",
"rootNamespace": "SofaUnityAPI"
}
7 changes: 7 additions & 0 deletions Runtime/Plugins/SofaUnity.API.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public SofaContextAPI(bool async)
CopyAssetToPersistent();

// load the sofaIni file
string pathIni = Application.dataPath + "/SofaUnity/Core/Plugins/Native/x64/sofa.ini";
string pathIni = Application.dataPath + "/SofaUnity/Runtime/Plugins/Native/x64/sofa.ini";
string sharePath = sofaPhysicsAPI_loadSofaIni(m_native, pathIni);

if (sharePath.Contains("Error"))
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
154 changes: 154 additions & 0 deletions Runtime/Resources/Materials/UnlitMaterial.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UnlitMaterial
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- DistortionVectors
- MOTIONVECTORS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionVectorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissiveColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: -1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _UnlitColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlbedoAffectEmissive: 0
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0
- _AlphaDstBlend: 0
- _AlphaSrcBlend: 1
- _BlendMode: 0
- _BumpScale: 1
- _CullMode: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlendMode: 0
- _DistortionBlurBlendMode: 0
- _DistortionBlurDstBlend: 1
- _DistortionBlurRemapMax: 1
- _DistortionBlurRemapMin: 0
- _DistortionBlurScale: 1
- _DistortionBlurSrcBlend: 1
- _DistortionDepthTest: 1
- _DistortionDstBlend: 1
- _DistortionEnable: 0
- _DistortionOnly: 0
- _DistortionScale: 1
- _DistortionSrcBlend: 1
- _DistortionVectorBias: -1
- _DistortionVectorScale: 2
- _DoubleSidedEnable: 0
- _DstBlend: 0
- _DynamicEmissionLM: 0
- _EmissionLM: 0
- _EmissiveExposureWeight: 1
- _EmissiveIntensity: 1
- _EmissiveIntensityUnit: 0
- _EnableFogOnTransparent: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _IncludeIndirectLighting: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StencilRef: 0
- _StencilRefDepth: 0
- _StencilRefDistortionVec: 4
- _StencilRefMV: 32
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskDistortionVec: 4
- _StencilWriteMaskMV: 40
- _SurfaceType: 0
- _TransparentCullMode: 2
- _TransparentSortPriority: 0
- _TransparentZWrite: 0
- _UVSec: 0
- _UseEmissiveIntensity: 0
- _ZTestDepthEqualForOpaque: 3
- _ZTestModeDistortion: 4
- _ZTestTransparent: 4
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
- _UnlitColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!114 &7921217498421344444
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2
8 changes: 8 additions & 0 deletions Runtime/Resources/Materials/UnlitMaterial.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
Loading