TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

integrate with panda environment a bit better

Browse Source
This commit is contained in:
David Rose 2009-09-15 19:38:14 +00:00
parent 9a96ac6a23
commit a5a779cf33
7 changed files with 294 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
direct/src/plugin_activex/P3DActiveX.sln
View File

@ -1,32 +1,21 @@
Microsoft Visual Studio Solution File, Format Version 8.00 Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "P3DActiveX", "P3DActiveX.vcproj", "{74451B00-2D87-412B-9359-B5CA2C2FEC2A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "P3DActiveX", "P3DActiveX.vcproj", "{74451B00-2D87-412B-9359-B5CA2C2FEC2A}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{1278896B-1978-40CC-B1A0-2D6A7450A32C} = {1278896B-1978-40CC-B1A0-2D6A7450A32C} EndProjectSection
EndProjectSection EndProject
EndProject Global
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\..\..\wintools\sdk\tinyxml\tinyxml_lib_mfc_static.vcproj", "{1278896B-1978-40CC-B1A0-2D6A7450A32C}" GlobalSection(SolutionConfiguration) = preSolution
ProjectSection(ProjectDependencies) = postProject Debug = Debug
EndProjectSection Release = Release
EndProject EndGlobalSection
Global GlobalSection(ProjectConfiguration) = postSolution
GlobalSection(SolutionConfiguration) = preSolution {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.ActiveCfg = Debug|Win32
Debug = Debug {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.Build.0 = Debug|Win32
Release = Release {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.ActiveCfg = Release|Win32
EndGlobalSection {74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.Build.0 = Release|Win32
GlobalSection(ProjectDependencies) = postSolution EndGlobalSection
EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution
GlobalSection(ProjectConfiguration) = postSolution EndGlobalSection
{74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.ActiveCfg = Debug|Win32 GlobalSection(ExtensibilityAddIns) = postSolution
{74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Debug.Build.0 = Debug|Win32 EndGlobalSection
{74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.ActiveCfg = Release|Win32 EndGlobal
{74451B00-2D87-412B-9359-B5CA2C2FEC2A}.Release.Build.0 = Release|Win32
{1278896B-1978-40CC-B1A0-2D6A7450A32C}.Debug.ActiveCfg = Debug|Win32
{1278896B-1978-40CC-B1A0-2D6A7450A32C}.Debug.Build.0 = Debug|Win32
{1278896B-1978-40CC-B1A0-2D6A7450A32C}.Release.ActiveCfg = Release|Win32
{1278896B-1978-40CC-B1A0-2D6A7450A32C}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal

514
direct/src/plugin_activex/P3DActiveX.vcproj
View File

@ -1,254 +1,260 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="7.10" Version="7.10"
Name="P3DActiveX" Name="P3DActiveX"
ProjectGUID="{74451B00-2D87-412B-9359-B5CA2C2FEC2A}" ProjectGUID="{74451B00-2D87-412B-9359-B5CA2C2FEC2A}"
Keyword="MFCActiveXProj"> Keyword="MFCActiveXProj">
<Platforms> <Platforms>
<Platform <Platform
Name="Win32"/> Name="Win32"/>
</Platforms> </Platforms>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="Debug"
IntermediateDirectory="Debug" IntermediateDirectory="Debug"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="1" UseOfMFC="2"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\;..\..\.." AdditionalIncludeDirectories="..\plugin;..\..\..\wintools\sdk\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="TRUE" TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="TRUE" Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/> DebugInformationFormat="3"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)/P3DActiveX.ocx" AdditionalDependencies="tinyxml_d.lib"
LinkIncremental="2" OutputFile="$(OutDir)/P3DActiveX.ocx"
AdditionalLibraryDirectories="" LinkIncremental="1"
ModuleDefinitionFile=".\P3DActiveX.def" AdditionalLibraryDirectories="../../../wintools/built/lib"
GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBCI.LIB MSVCRTD.LIB MSVCRT.LIB"
SubSystem="2" ModuleDefinitionFile=".\P3DActiveX.def"
ImportLibrary="$(OutDir)/P3DActiveX.lib" GenerateDebugInformation="TRUE"
TargetMachine="1"/> SubSystem="2"
<Tool ImportLibrary="$(OutDir)/P3DActiveX.lib"
Name="VCMIDLTool" TargetMachine="1"
PreprocessorDefinitions="_DEBUG" FixedBaseAddress="1"/>
MkTypLibCompatible="FALSE" <Tool
TypeLibraryName="$(IntDir)/$(ProjectName).tlb" Name="VCMIDLTool"
HeaderFileName="$(ProjectName)idl.h"/> PreprocessorDefinitions="_DEBUG"
<Tool MkTypLibCompatible="FALSE"
Name="VCPostBuildEventTool" TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
Description="Performing registration" HeaderFileName="$(ProjectName)idl.h"/>
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"/> <Tool
<Tool Name="VCPostBuildEventTool"
Name="VCPreBuildEventTool"/> Description="Performing registration"
<Tool CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"/>
Name="VCPreLinkEventTool"/> <Tool
<Tool Name="VCPreBuildEventTool"/>
Name="VCResourceCompilerTool" <Tool
PreprocessorDefinitions="_DEBUG" Name="VCPreLinkEventTool"/>
Culture="1033" <Tool
AdditionalIncludeDirectories="$(IntDir)"/> Name="VCResourceCompilerTool"
<Tool PreprocessorDefinitions="_DEBUG"
Name="VCWebServiceProxyGeneratorTool"/> Culture="1033"
<Tool AdditionalIncludeDirectories="$(IntDir)"/>
Name="VCXMLDataGeneratorTool"/> <Tool
<Tool Name="VCWebServiceProxyGeneratorTool"/>
Name="VCWebDeploymentTool"/> <Tool
<Tool Name="VCXMLDataGeneratorTool"/>
Name="VCManagedWrapperGeneratorTool"/> <Tool
<Tool Name="VCWebDeploymentTool"/>
Name="VCAuxiliaryManagedWrapperGeneratorTool"/> <Tool
</Configuration> Name="VCManagedWrapperGeneratorTool"/>
<Configuration <Tool
Name="Release|Win32" Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
OutputDirectory="Release" </Configuration>
IntermediateDirectory="Release" <Configuration
ConfigurationType="2" Name="Release|Win32"
UseOfMFC="1" OutputDirectory="Release"
CharacterSet="2"> IntermediateDirectory="Release"
<Tool ConfigurationType="2"
Name="VCCLCompilerTool" UseOfMFC="2"
AdditionalIncludeDirectories="..\;..\..\.." CharacterSet="2">
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL" <Tool
RuntimeLibrary="0" Name="VCCLCompilerTool"
TreatWChar_tAsBuiltInType="TRUE" AdditionalIncludeDirectories="..\plugin;..\..\..\wintools\sdk\tinyxml"
UsePrecompiledHeader="3" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
WarningLevel="3" RuntimeLibrary="2"
Detect64BitPortabilityProblems="TRUE" TreatWChar_tAsBuiltInType="TRUE"
DebugInformationFormat="3"/> UsePrecompiledHeader="0"
<Tool WarningLevel="3"
Name="VCCustomBuildTool"/> Detect64BitPortabilityProblems="TRUE"
<Tool DebugInformationFormat="3"/>
Name="VCLinkerTool" <Tool
OutputFile="$(OutDir)/P3DActiveX.ocx" Name="VCCustomBuildTool"/>
LinkIncremental="1" <Tool
AdditionalLibraryDirectories="" Name="VCLinkerTool"
ModuleDefinitionFile=".\P3DActiveX.def" AdditionalDependencies="tinyxml.lib"
GenerateDebugInformation="TRUE" OutputFile="$(OutDir)/P3DActiveX.ocx"
SubSystem="2" LinkIncremental="1"
OptimizeReferences="2" AdditionalLibraryDirectories="../../../wintools/built/lib"
EnableCOMDATFolding="2" IgnoreDefaultLibraryNames="LIBCI.LIB MSVCRTD.LIB MSVCRT.LIB"
ImportLibrary="$(OutDir)/P3DActiveX.lib" ModuleDefinitionFile=".\P3DActiveX.def"
TargetMachine="1"/> GenerateDebugInformation="TRUE"
<Tool SubSystem="2"
Name="VCMIDLTool" OptimizeReferences="2"
PreprocessorDefinitions="NDEBUG" EnableCOMDATFolding="2"
MkTypLibCompatible="FALSE" ImportLibrary="$(OutDir)/P3DActiveX.lib"
TypeLibraryName="$(IntDir)/$(ProjectName).tlb" TargetMachine="1"
HeaderFileName="$(ProjectName)idl.h"/> FixedBaseAddress="1"/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCMIDLTool"
Description="Performing registration" PreprocessorDefinitions="NDEBUG"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"/> MkTypLibCompatible="FALSE"
<Tool TypeLibraryName="$(IntDir)/$(ProjectName).tlb"
Name="VCPreBuildEventTool"/> HeaderFileName="$(ProjectName)idl.h"/>
<Tool <Tool
Name="VCPreLinkEventTool"/> Name="VCPostBuildEventTool"
<Tool Description="Performing registration"
Name="VCResourceCompilerTool" CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"/>
PreprocessorDefinitions="NDEBUG" <Tool
Culture="1033" Name="VCPreBuildEventTool"/>
AdditionalIncludeDirectories="$(IntDir)"/> <Tool
<Tool Name="VCPreLinkEventTool"/>
Name="VCWebServiceProxyGeneratorTool"/> <Tool
<Tool Name="VCResourceCompilerTool"
Name="VCXMLDataGeneratorTool"/> PreprocessorDefinitions="NDEBUG"
<Tool Culture="1033"
Name="VCWebDeploymentTool"/> AdditionalIncludeDirectories="$(IntDir)"/>
<Tool <Tool
Name="VCManagedWrapperGeneratorTool"/> Name="VCWebServiceProxyGeneratorTool"/>
<Tool <Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/> Name="VCXMLDataGeneratorTool"/>
</Configuration> <Tool
</Configurations> Name="VCWebDeploymentTool"/>
<References> <Tool
</References> Name="VCManagedWrapperGeneratorTool"/>
<Files> <Tool
<Filter Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="Source Files" </Configuration>
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" </Configurations>
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <References>
<File </References>
RelativePath=".\P3DActiveX.cpp"> <Files>
</File> <Filter
<File Name="Source Files"
RelativePath=".\P3DActiveX.idl"> Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
</File> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File <File
RelativePath=".\P3DActiveXCtrl.cpp"> RelativePath=".\P3DActiveX.cpp">
</File> </File>
<File <File
RelativePath=".\P3DActiveXPropPage.cpp"> RelativePath=".\P3DActiveX.idl">
</File> </File>
<File <File
RelativePath=".\PPBrowserObject.cpp"> RelativePath=".\P3DActiveXCtrl.cpp">
</File> </File>
<File <File
RelativePath=".\PPDownloadCallback.cpp"> RelativePath=".\P3DActiveXPropPage.cpp">
</File> </File>
<File <File
RelativePath=".\PPDownloadRequest.cpp"> RelativePath=".\PPBrowserObject.cpp">
</File> </File>
<File <File
RelativePath=".\PPInstance.cpp"> RelativePath=".\PPDownloadCallback.cpp">
</File> </File>
<File <File
RelativePath=".\PPInterface.cpp"> RelativePath=".\PPDownloadRequest.cpp">
</File> </File>
<File <File
RelativePath=".\PPLogger.cpp"> RelativePath=".\PPInstance.cpp">
</File> </File>
<File <File
RelativePath=".\PPPandaObject.cpp"> RelativePath=".\PPInterface.cpp">
</File> </File>
<File <File
RelativePath=".\stdafx.cpp"> RelativePath=".\PPLogger.cpp">
<FileConfiguration </File>
Name="Debug|Win32"> <File
<Tool RelativePath=".\PPPandaObject.cpp">
Name="VCCLCompilerTool" </File>
UsePrecompiledHeader="1"/> <File
</FileConfiguration> RelativePath=".\stdafx.cpp">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Debug|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/> UsePrecompiledHeader="1"/>
</FileConfiguration> </FileConfiguration>
</File> <FileConfiguration
</Filter> Name="Release|Win32">
<Filter <Tool
Name="Header Files" Name="VCCLCompilerTool"
Filter="h;hpp;hxx;hm;inl;inc;xsd" UsePrecompiledHeader="1"/>
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> </FileConfiguration>
<File </File>
RelativePath=".\P3DActiveX.h"> </Filter>
</File> <Filter
<File Name="Header Files"
RelativePath=".\P3DActiveXCtrl.h"> Filter="h;hpp;hxx;hm;inl;inc;xsd"
</File> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File <File
RelativePath=".\P3DActiveXPropPage.h"> RelativePath=".\P3DActiveX.h">
</File> </File>
<File <File
RelativePath=".\PPBrowserObject.h"> RelativePath=".\P3DActiveXCtrl.h">
</File> </File>
<File <File
RelativePath=".\PPDownloadCallback.h"> RelativePath=".\P3DActiveXPropPage.h">
</File> </File>
<File <File
RelativePath=".\PPDownloadRequest.h"> RelativePath=".\PPBrowserObject.h">
</File> </File>
<File <File
RelativePath=".\PPInstance.h"> RelativePath=".\PPDownloadCallback.h">
</File> </File>
<File <File
RelativePath=".\PPInterface.h"> RelativePath=".\PPDownloadRequest.h">
</File> </File>
<File <File
RelativePath=".\PPLogger.h"> RelativePath=".\PPInstance.h">
</File> </File>
<File <File
RelativePath=".\PPPandaObject.h"> RelativePath=".\PPInterface.h">
</File> </File>
<File <File
RelativePath=".\Resource.h"> RelativePath=".\PPLogger.h">
</File> </File>
<File <File
RelativePath=".\stdafx.h"> RelativePath=".\PPPandaObject.h">
</File> </File>
</Filter> <File
<Filter RelativePath=".\Resource.h">
Name="Resource Files" </File>
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" <File
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> RelativePath=".\stdafx.h">
<File </File>
RelativePath=".\P3DActiveX.rc"> </Filter>
</File> <Filter
<File Name="Resource Files"
RelativePath=".\P3DActiveXCtrl.bmp"> Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
</File> UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
</Filter> <File
<File RelativePath=".\P3DActiveX.rc">
RelativePath=".\ReadMe.txt"> </File>
</File> <File
</Files> RelativePath=".\P3DActiveXCtrl.bmp">
<Globals> </File>
<Global </Filter>
Name="RESOURCE_FILE" <File
Value="P3DActiveX.rc"/> RelativePath=".\ReadMe.txt">
</Globals> </File>
</VisualStudioProject> </Files>
<Globals>
<Global
Name="RESOURCE_FILE"
Value="P3DActiveX.rc"/>
</Globals>
</VisualStudioProject>

2
direct/src/plugin_activex/PPBrowserObject.h
View File

@ -14,7 +14,7 @@
#pragma once #pragma once
#include "plugin/p3d_plugin.h" #include "p3d_plugin.h"
#include <string> #include <string>
class PPInterface; class PPInterface;

15
direct/src/plugin_activex/PPInstance.cpp
View File

@ -33,13 +33,11 @@
#include "PPBrowserObject.h" #include "PPBrowserObject.h"
#include "PPDownloadRequest.h" #include "PPDownloadRequest.h"
#include "wintools/sdk/tinyxml/tinyxml.h" #include "p3d_plugin_config.h"
#include "tinyxml.h"
#define P3D_CONTENTS_FILENAME "contents.xml" #define P3D_CONTENTS_FILENAME "contents.xml"
#define P3D_BASE_URL "http://www.ddrose.com/~drose/p3d_7/"
//#define P3D_BASE_URL "file:///C:/p3dstage/"
#define P3D_FILE_BASE_URL "http://www.ddrose.com/~drose/plugin/" #define P3D_FILE_BASE_URL "http://www.ddrose.com/~drose/plugin/"
//#define P3D_FILE_BASE_URL "file:///C:/temp/" //#define P3D_FILE_BASE_URL "file:///C:/temp/"
@ -171,13 +169,18 @@ int PPInstance::DownloadP3DComponents( std::string& p3dDllFilename, std::string&
std::string localContentsFileName( tempFolderName, pathLength ); std::string localContentsFileName( tempFolderName, pathLength );
localContentsFileName += P3D_CONTENTS_FILENAME; localContentsFileName += P3D_CONTENTS_FILENAME;
std::string remoteContentsFilename( P3D_BASE_URL ); std::string hostUrl( PANDA_PACKAGE_HOST_URL );
if (!hostUrl.empty() && hostUrl[hostUrl.size() - 1] != '/') {
hostUrl += '/';
}
std::string remoteContentsFilename( hostUrl );
remoteContentsFilename += P3D_CONTENTS_FILENAME; remoteContentsFilename += P3D_CONTENTS_FILENAME;
error = DownloadFile( remoteContentsFilename, localContentsFileName ); error = DownloadFile( remoteContentsFilename, localContentsFileName );
if ( !error ) if ( !error )
{ {
std::string p3dRemoteModuleFileName( P3D_BASE_URL ); std::string p3dRemoteModuleFileName( hostUrl );
error = ReadContents( localContentsFileName, p3dRemoteModuleFileName ); error = ReadContents( localContentsFileName, p3dRemoteModuleFileName );
if ( !error ) if ( !error )
{ {

2
direct/src/plugin_activex/PPInstance.h
View File

@ -18,7 +18,7 @@
#include <math.h> #include <math.h>
#include "afxmt.h" #include "afxmt.h"
#include "plugin/p3d_plugin.h" #include "p3d_plugin.h"
#include "PPDownloadCallback.h" #include "PPDownloadCallback.h"
#include "PPLogger.h" #include "PPLogger.h"

2
direct/src/plugin_activex/PPInterface.h
View File

@ -14,7 +14,7 @@
#pragma once #pragma once
#include "plugin/p3d_plugin.h" #include "p3d_plugin.h"
class PPInterface class PPInterface
{ {

2
direct/src/plugin_activex/PPPandaObject.h
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "plugin/p3d_plugin.h" #include "p3d_plugin.h"
#include "PPInterface.h" #include "PPInterface.h"
class PPandaObject : public IDispatch class PPandaObject : public IDispatch